redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] spufs: serialize sys_spu_run per spu 

During an earlier cleanup, we lost the serialization
of multiple spu_run calls performed on the same
spu_context. In order to get this back, introduce a
mutex in the spu_context that is held inside of spu_run.

Noticed by Al Viro.

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
hifive-unleashed-5.1
Arnd Bergmann 2006-01-04 20:31:24 +01:00 committed by Paul Mackerras
parent e80358ad86
commit 5ef8224aaa
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/cell/spufs/context.c
View File

@ -43,6 +43,7 @@ struct spu_context *alloc_spu_context(struct address_space *local_store)
spin_lock_init(&ctx->mmio_lock);
kref_init(&ctx->kref);
init_rwsem(&ctx->state_sema);
init_MUTEX(&ctx->run_sema);
init_waitqueue_head(&ctx->ibox_wq);
init_waitqueue_head(&ctx->wbox_wq);
init_waitqueue_head(&ctx->stop_wq);

15
arch/powerpc/platforms/cell/spufs/file.c
View File

@ -620,8 +620,12 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
{
int ret;
if ((ret = spu_run_init(ctx, npc, status)) != 0)
return ret;
if (down_interruptible(&ctx->run_sema))
return -ERESTARTSYS;
ret = spu_run_init(ctx, npc, status);
if (ret)
goto out;
do {
ret = spufs_wait(ctx->stop_wq, spu_stopped(ctx, status));
@ -629,9 +633,8 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
break;
if (unlikely(ctx->state != SPU_STATE_RUNNABLE)) {
ret = spu_reacquire_runnable(ctx, npc, status);
if (ret) {
return ret;
}
if (ret)
goto out;
continue;
}
ret = spu_process_events(ctx);
@ -645,6 +648,8 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
ret = *status;
spu_yield(ctx);
out:
up(&ctx->run_sema);
return ret;
}

1
arch/powerpc/platforms/cell/spufs/spufs.h
View File

@ -48,6 +48,7 @@ struct spu_context {
enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state;
struct rw_semaphore state_sema;
struct semaphore run_sema;
struct mm_struct *owner;