Skip to content

Commit

Permalink
[SCSI] sg: avoid blk_put_request/blk_rq_unmap_user in interrupt
Browse files Browse the repository at this point in the history
This fixes the following oops:

http://marc.info/?l=linux-kernel&m=123316111415677&w=2

You can reproduce this bug by interrupting a program before a sg
response completes. This leads to the special sg state (the orphan
state), then sg calls blk_put_request in interrupt (rq->end_io).

The above bug report shows the recursive lock problem because sg calls
blk_put_request in interrupt. We could call __blk_put_request here
instead however we also need to handle blk_rq_unmap_user here, which
can't be called in interrupt too.

In the orphan state, we don't need to care about the data transfer
(the program revoked the command) so adding 'just free the resource'
mode to blk_rq_unmap_user is a possible option.

I prefer to avoid complicating the blk mapping API when possible. I
change the orphan state to call sg_finish_rem_req via
execute_in_process_context. We hold sg_fd->kref so sg_fd doesn't go
away until keventd_wq finishes our work. copy_from_user/to_user fails
so blk_rq_unmap_user just frees the resource without the data
transfer.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
FUJITA Tomonori authored and James Bottomley committed Mar 12, 2009
1 parent a3b7aea commit c96952e
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/scsi/sg.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ typedef struct sg_request { /* SG_MAX_QUEUE requests outstanding per file */
volatile char done; /* 0->before bh, 1->before read, 2->read */
struct request *rq;
struct bio *bio;
struct execute_work ew;
} Sg_request;

typedef struct sg_fd { /* holds the state of a file descriptor */
Expand Down Expand Up @@ -1234,6 +1235,15 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
return 0;
}

static void sg_rq_end_io_usercontext(struct work_struct *work)
{
struct sg_request *srp = container_of(work, struct sg_request, ew.work);
struct sg_fd *sfp = srp->parentfp;

sg_finish_rem_req(srp);
kref_put(&sfp->f_ref, sg_remove_sfp);
}

/*
* This function is a "bottom half" handler that is called by the mid
* level when a command is completed (or has failed).
Expand Down Expand Up @@ -1312,10 +1322,9 @@ static void sg_rq_end_io(struct request *rq, int uptodate)
*/
wake_up_interruptible(&sfp->read_wait);
kill_fasync(&sfp->async_qp, SIGPOLL, POLL_IN);
kref_put(&sfp->f_ref, sg_remove_sfp);
} else
sg_finish_rem_req(srp); /* call with srp->done == 0 */

kref_put(&sfp->f_ref, sg_remove_sfp);
execute_in_process_context(sg_rq_end_io_usercontext, &srp->ew);
}

static struct file_operations sg_fops = {
Expand Down

0 comments on commit c96952e

Please sign in to comment.