Skip to content

Commit

Permalink
[POWERPC] spufs: DMA Restart after SIGSEGV
Browse files Browse the repository at this point in the history
This fixes the behavior of spufs when a spu tries a DMA operation
based on a wrong / unavailable address.

Instead of just generating a SIGBUS signal, spufs now
generates a SIGSEGV signal and restarts the problematic DMA operation
after the execution of the application's signal handler.  This allows
applications to employ user-level paging systems.

Although the restart_dma function is called before the application's
signal handler, the operation is not actually performed at this time,
since the spu context is already stopped.  The operation only takes
place when spu_run is restarted (which happens automatically).

Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Andre Detsch authored and Paul Mackerras committed Dec 21, 2007
1 parent 90608a2 commit 18789fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/spufs/backing_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int spu_backing_send_mfc_command(struct spu_context *ctx,

static void spu_backing_restart_dma(struct spu_context *ctx)
{
/* nothing to do here */
ctx->csa.priv2.mfc_control_RW |= MFC_CNTL_RESTART_DMA_COMMAND;
}

struct spu_context_ops spu_backing_ops = {
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/platforms/cell/spufs/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ static void spufs_handle_event(struct spu_context *ctx,
info.si_code = BUS_OBJERR;
break;
case SPE_EVENT_SPE_DATA_STORAGE:
info.si_signo = SIGBUS;
info.si_signo = SIGSEGV;
info.si_addr = (void __user *)ea;
info.si_code = BUS_ADRERR;
info.si_code = SEGV_ACCERR;
ctx->ops->restart_dma(ctx);
break;
case SPE_EVENT_DMA_ALIGNMENT:
info.si_signo = SIGBUS;
Expand Down

0 comments on commit 18789fb

Please sign in to comment.