diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2008-03-11 12:46:18 +1100 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2008-03-11 12:46:18 +1100 |
| commit | c368392a9951e6e25e2e2f9268153f1e9365e2c2 (patch) | |
| tree | d00ec74a057bbc9ab251c6a8c47787c757cc9340 /arch | |
| parent | ce7c191bca88aa2f942f70a6d6c6315739a81a32 (diff) | |
| download | op-kernel-dev-c368392a9951e6e25e2e2f9268153f1e9365e2c2.zip op-kernel-dev-c368392a9951e6e25e2e2f9268153f1e9365e2c2.tar.gz | |
[POWERPC] spufs: fix rescheduling of non-runnable contexts
At present, we can hit the BUG_ON in __spu_update_sched_info by reading
the regs file of a context between two calls to spu_run. The
spu_release_saved called by spufs_regs_read() is resulting in the (now
non-runnable) context being placed back on the run queue, so the next
call to spu_run ends up in the bug condition.
This change uses the SPU_SCHED_SPU_RUN flag to only reschedule a context
if it's still in spu_run().
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c index cf6c2c8..0ad83ae 100644 --- a/arch/powerpc/platforms/cell/spufs/context.c +++ b/arch/powerpc/platforms/cell/spufs/context.c @@ -170,7 +170,8 @@ void spu_release_saved(struct spu_context *ctx) { BUG_ON(ctx->state != SPU_STATE_SAVED); - if (test_and_clear_bit(SPU_SCHED_WAS_ACTIVE, &ctx->sched_flags)) + if (test_and_clear_bit(SPU_SCHED_WAS_ACTIVE, &ctx->sched_flags) && + test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags)) spu_activate(ctx, 0); spu_release(ctx); |
