lkml.org 
[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[215/264] [SCSI] Make scsi_free_queue() kill pending SCSI commands
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bart Van Assche <bvanassche@acm.org>

    commit 3308511c93e6ad0d3c58984ecd6e5e57f96b12c8 upstream.

    Make sure that SCSI device removal via scsi_remove_host() does finish
    all pending SCSI commands. Currently that's not the case and hence
    removal of a SCSI host during I/O can cause a deadlock. See also
    "blkdev_issue_discard() hangs forever if underlying storage device is
    removed" (http://bugzilla.kernel.org/show_bug.cgi?id=40472). See also
    http://lkml.org/lkml/2011/8/27/6.

    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/scsi/hosts.c | 9 ++++++---
    drivers/scsi/scsi_lib.c | 9 +++++++++
    2 files changed, 15 insertions(+), 3 deletions(-)

    --- a/drivers/scsi/hosts.c
    +++ b/drivers/scsi/hosts.c
    @@ -286,6 +286,7 @@ static void scsi_host_dev_release(struct
    {
    struct Scsi_Host *shost = dev_to_shost(dev);
    struct device *parent = dev->parent;
    + struct request_queue *q;

    scsi_proc_hostdir_rm(shost->hostt);

    @@ -293,9 +294,11 @@ static void scsi_host_dev_release(struct
    kthread_stop(shost->ehandler);
    if (shost->work_q)
    destroy_workqueue(shost->work_q);
    - if (shost->uspace_req_q) {
    - kfree(shost->uspace_req_q->queuedata);
    - scsi_free_queue(shost->uspace_req_q);
    + q = shost->uspace_req_q;
    + if (q) {
    + kfree(q->queuedata);
    + q->queuedata = NULL;
    + scsi_free_queue(q);
    }

    scsi_destroy_command_freelist(shost);
    --- a/drivers/scsi/scsi_lib.c
    +++ b/drivers/scsi/scsi_lib.c
    @@ -1698,6 +1698,15 @@ struct request_queue *scsi_alloc_queue(s

    void scsi_free_queue(struct request_queue *q)
    {
    + unsigned long flags;
    +
    + WARN_ON(q->queuedata);
    +
    + /* cause scsi_request_fn() to kill all non-finished requests */
    + spin_lock_irqsave(q->queue_lock, flags);
    + q->request_fn(q);
    + spin_unlock_irqrestore(q->queue_lock, flags);
    +
    blk_cleanup_queue(q);
    }




    \
     
     \ /
      Last update: 2011-11-10 05:07    [W:0.022 / U:60.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site