Skip to content

Commit

Permalink
spufs: Convert nopfn to fault
Browse files Browse the repository at this point in the history 
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Nick Piggin authored and Paul Mackerras committed Jun 30, 2008
1 parent 1976aef commit b1e2270
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 52 deletions.
98 changes: 50 additions & 48 deletions arch/powerpc/platforms/cell/spufs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,13 @@ spufs_mem_write(struct file *file, const char __user *buffer,
return size;
}

static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct spu_context *ctx = vma->vm_file->private_data;
unsigned long pfn, offset, addr0 = address;
unsigned long address = (unsigned long)vmf->virtual_address;
unsigned long pfn, offset;

#ifdef CONFIG_SPU_FS_64K_LS
struct spu_state *csa = &ctx->csa;
int psize;
Expand All @@ -260,15 +262,15 @@ static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
}
#endif /* CONFIG_SPU_FS_64K_LS */

offset = (address - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
offset = vmf->pgoff << PAGE_SHIFT;
if (offset >= LS_SIZE)
return NOPFN_SIGBUS;
return VM_FAULT_SIGBUS;

pr_debug("spufs_mem_mmap_nopfn address=0x%lx -> 0x%lx, offset=0x%lx\n",
addr0, address, offset);
pr_debug("spufs_mem_mmap_fault address=0x%lx, offset=0x%lx\n",
address, offset);

if (spu_acquire(ctx))
return NOPFN_REFAULT;
return VM_FAULT_NOPAGE;

if (ctx->state == SPU_STATE_SAVED) {
vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
Expand All @@ -283,12 +285,12 @@ static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,

spu_release(ctx);

return NOPFN_REFAULT;
return VM_FAULT_NOPAGE;
}


static struct vm_operations_struct spufs_mem_mmap_vmops = {
.nopfn = spufs_mem_mmap_nopfn,
.fault = spufs_mem_mmap_fault,
};

static int spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
Expand Down Expand Up @@ -351,20 +353,19 @@ static const struct file_operations spufs_mem_fops = {
#endif
};

static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
unsigned long address,
static int spufs_ps_fault(struct vm_area_struct *vma,
struct vm_fault *vmf,
unsigned long ps_offs,
unsigned long ps_size)
{
struct spu_context *ctx = vma->vm_file->private_data;
unsigned long area, offset = address - vma->vm_start;
unsigned long area, offset = vmf->pgoff << PAGE_SHIFT;
int ret = 0;

spu_context_nospu_trace(spufs_ps_nopfn__enter, ctx);
spu_context_nospu_trace(spufs_ps_fault__enter, ctx);

offset += vma->vm_pgoff << PAGE_SHIFT;
if (offset >= ps_size)
return NOPFN_SIGBUS;
return VM_FAULT_SIGBUS;

/*
* Because we release the mmap_sem, the context may be destroyed while
Expand All @@ -378,41 +379,42 @@ static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
* pages to hand out to the user, but we don't want to wait
* with the mmap_sem held.
* It is possible to drop the mmap_sem here, but then we need
* to return NOPFN_REFAULT because the mappings may have
* to return VM_FAULT_NOPAGE because the mappings may have
* hanged.
*/
if (spu_acquire(ctx))
goto refault;

if (ctx->state == SPU_STATE_SAVED) {
up_read(&current->mm->mmap_sem);
spu_context_nospu_trace(spufs_ps_nopfn__sleep, ctx);
spu_context_nospu_trace(spufs_ps_fault__sleep, ctx);
ret = spufs_wait(ctx->run_wq, ctx->state == SPU_STATE_RUNNABLE);
spu_context_trace(spufs_ps_nopfn__wake, ctx, ctx->spu);
spu_context_trace(spufs_ps_fault__wake, ctx, ctx->spu);
down_read(&current->mm->mmap_sem);
} else {
area = ctx->spu->problem_phys + ps_offs;
vm_insert_pfn(vma, address, (area + offset) >> PAGE_SHIFT);
spu_context_trace(spufs_ps_nopfn__insert, ctx, ctx->spu);
vm_insert_pfn(vma, (unsigned long)vmf->virtual_address,
(area + offset) >> PAGE_SHIFT);
spu_context_trace(spufs_ps_fault__insert, ctx, ctx->spu);
}

if (!ret)
spu_release(ctx);

refault:
put_spu_context(ctx);
return NOPFN_REFAULT;
return VM_FAULT_NOPAGE;
}

#if SPUFS_MMAP_4K
static unsigned long spufs_cntl_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int spufs_cntl_mmap_fault(struct vm_area_struct *vma,
struct vm_fault *vmf)
{
return spufs_ps_nopfn(vma, address, 0x4000, 0x1000);
return spufs_ps_fault(vma, vmf, 0x4000, 0x1000);
}

static struct vm_operations_struct spufs_cntl_mmap_vmops = {
.nopfn = spufs_cntl_mmap_nopfn,
.fault = spufs_cntl_mmap_fault,
};

/*
Expand Down Expand Up @@ -1097,23 +1099,23 @@ static ssize_t spufs_signal1_write(struct file *file, const char __user *buf,
return 4;
}

static unsigned long spufs_signal1_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_signal1_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
#if PAGE_SIZE == 0x1000
return spufs_ps_nopfn(vma, address, 0x14000, 0x1000);
return spufs_ps_fault(vma, vmf, 0x14000, 0x1000);
#elif PAGE_SIZE == 0x10000
/* For 64k pages, both signal1 and signal2 can be used to mmap the whole
* signal 1 and 2 area
*/
return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
return spufs_ps_fault(vma, vmf, 0x10000, 0x10000);
#else
#error unsupported page size
#endif
}

static struct vm_operations_struct spufs_signal1_mmap_vmops = {
.nopfn = spufs_signal1_mmap_nopfn,
.fault = spufs_signal1_mmap_fault,
};

static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
Expand Down Expand Up @@ -1234,23 +1236,23 @@ static ssize_t spufs_signal2_write(struct file *file, const char __user *buf,
}

#if SPUFS_MMAP_4K
static unsigned long spufs_signal2_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_signal2_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
#if PAGE_SIZE == 0x1000
return spufs_ps_nopfn(vma, address, 0x1c000, 0x1000);
return spufs_ps_fault(vma, vmf, 0x1c000, 0x1000);
#elif PAGE_SIZE == 0x10000
/* For 64k pages, both signal1 and signal2 can be used to mmap the whole
* signal 1 and 2 area
*/
return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
return spufs_ps_fault(vma, vmf, 0x10000, 0x10000);
#else
#error unsupported page size
#endif
}

static struct vm_operations_struct spufs_signal2_mmap_vmops = {
.nopfn = spufs_signal2_mmap_nopfn,
.fault = spufs_signal2_mmap_fault,
};

static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
Expand Down Expand Up @@ -1362,14 +1364,14 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
spufs_signal2_type_set, "%llu\n", SPU_ATTR_ACQUIRE);

#if SPUFS_MMAP_4K
static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_mss_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
return spufs_ps_nopfn(vma, address, 0x0000, 0x1000);
return spufs_ps_fault(vma, vmf, 0x0000, 0x1000);
}

static struct vm_operations_struct spufs_mss_mmap_vmops = {
.nopfn = spufs_mss_mmap_nopfn,
.fault = spufs_mss_mmap_fault,
};

/*
Expand Down Expand Up @@ -1424,14 +1426,14 @@ static const struct file_operations spufs_mss_fops = {
.mmap = spufs_mss_mmap,
};

static unsigned long spufs_psmap_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_psmap_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
return spufs_ps_nopfn(vma, address, 0x0000, 0x20000);
return spufs_ps_fault(vma, vmf, 0x0000, 0x20000);
}

static struct vm_operations_struct spufs_psmap_mmap_vmops = {
.nopfn = spufs_psmap_mmap_nopfn,
.fault = spufs_psmap_mmap_fault,
};

/*
Expand Down Expand Up @@ -1484,14 +1486,14 @@ static const struct file_operations spufs_psmap_fops = {


#if SPUFS_MMAP_4K
static unsigned long spufs_mfc_mmap_nopfn(struct vm_area_struct *vma,
unsigned long address)
static int
spufs_mfc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
return spufs_ps_nopfn(vma, address, 0x3000, 0x1000);
return spufs_ps_fault(vma, vmf, 0x3000, 0x1000);
}

static struct vm_operations_struct spufs_mfc_mmap_vmops = {
.nopfn = spufs_mfc_mmap_nopfn,
.fault = spufs_mfc_mmap_fault,
};

/*
Expand Down
8 changes: 4 additions & 4 deletions arch/powerpc/platforms/cell/spufs/sputrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@ struct spu_probe spu_probes[] = {
{ "spu_yield__enter", "ctx %p", spu_context_nospu_event },
{ "spu_deactivate__enter", "ctx %p", spu_context_nospu_event },
{ "__spu_deactivate__unload", "ctx %p spu %p", spu_context_event },
{ "spufs_ps_nopfn__enter", "ctx %p", spu_context_nospu_event },
{ "spufs_ps_nopfn__sleep", "ctx %p", spu_context_nospu_event },
{ "spufs_ps_nopfn__wake", "ctx %p spu %p", spu_context_event },
{ "spufs_ps_nopfn__insert", "ctx %p spu %p", spu_context_event },
{ "spufs_ps_fault__enter", "ctx %p", spu_context_nospu_event },
{ "spufs_ps_fault__sleep", "ctx %p", spu_context_nospu_event },
{ "spufs_ps_fault__wake", "ctx %p spu %p", spu_context_event },
{ "spufs_ps_fault__insert", "ctx %p spu %p", spu_context_event },
{ "spu_acquire_saved__enter", "ctx %p", spu_context_nospu_event },
{ "destroy_spu_context__enter", "ctx %p", spu_context_nospu_event },
{ "spufs_stop_callback__enter", "ctx %p spu %p", spu_context_event },
Expand Down

0 comments on commit b1e2270

Please sign in to comment.