On 11/26/12 05:44, David Dillow wrote: > From: Bart Van Assche <bvanass...@acm.org> > > Some SCSI upper layer drivers, e.g. sd, issue SCSI commands from > inside scsi_remove_host() (see also the sd_shutdown() call in > sd_remove()). Make sure that these commands have a chance to reach > the SCSI device. > > Signed-off-by: Bart Van Assche <bvanass...@acm.org> > [ adapted to new state tracking ] > Signed-off-by: David Dillow <dillo...@ornl.gov> > --- > drivers/infiniband/ulp/srp/ib_srp.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c > b/drivers/infiniband/ulp/srp/ib_srp.c > index 2951e1c..f7d7e6a 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -1328,12 +1328,13 @@ static int srp_queuecommand(struct Scsi_Host *shost, > struct scsi_cmnd *scmnd) > int len; > > if (unlikely(target->state)) { > - if (!srp_is_removed(target)) > + /* > + * Only requeue commands if we cannot send them to the target. > + * We'll let commands through during shutdown so that caches > + * get flushed, etc. > + */ > + if (srp_is_disconnected(target) || srp_in_error(target)) > goto err; > - > - scmnd->result = DID_BAD_TARGET << 16; > - scmnd->scsi_done(scmnd); > - return 0; > } > > spin_lock_irqsave(&target->lock, flags);
Hi Dave, After I posted the patch on which the above patch has been based I realized that it can be simplified. Since the patch called "Eliminate state SRP_TARGET_CONNECTING" blocks the SCSI host as long as the RDMA RC connection is being reconnected srp_queuecommand() won't be invoked during the "disconnected" or "error" state. How about adding the patch below just after the patch that eliminates the state SRP_TARGET_CONNECTING ? Bart. [PATCH] ib_srp: Keep processing commands during host removal Some SCSI upper layer drivers, e.g. sd, issue SCSI commands from inside scsi_remove_host(). See also the sd_shutdown() call in sd_remove(). Make sure that these commands have a chance to reach the SCSI device. Signed-off-by: Bart Van Assche <bvanass...@acm.org> --- drivers/infiniband/ulp/srp/ib_srp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 39723e7..03b9fa0 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1324,13 +1324,6 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd) unsigned long flags; int len; - if (target->state == SRP_TARGET_DEAD || - target->state == SRP_TARGET_REMOVED) { - scmnd->result = DID_BAD_TARGET << 16; - scmnd->scsi_done(scmnd); - return 0; - } - spin_lock_irqsave(&target->lock, flags); iu = __srp_get_tx_iu(target, SRP_IU_CMD); if (!iu) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html