1 files changed, 44 insertions, 26 deletions

diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index ae45bd99baed..e3cd3ece4412 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -61,6 +61,11 @@ static inline struct Scsi_Host *rport_to_shost(struct srp_rport *r)
         return dev_to_shost(r->dev.parent);
 }
 
+static inline struct srp_rport *shost_to_rport(struct Scsi_Host *shost)
+{
+        return transport_class_to_srp_rport(&shost->shost_gendev);
+}
+
 /**
  * srp_tmo_valid() - check timeout combination validity
  * @reconnect_delay: Reconnect delay in seconds.
@@ -198,7 +203,7 @@ static ssize_t srp_show_tmo(char *buf, int tmo)
         return tmo >= 0 ? sprintf(buf, "%d\n", tmo) : sprintf(buf, "off\n");
 }
 
-static int srp_parse_tmo(int *tmo, const char *buf)
+int srp_parse_tmo(int *tmo, const char *buf)
 {
         int res = 0;
 
@@ -209,6 +214,7 @@ static int srp_parse_tmo(int *tmo, const char *buf)
 
         return res;
 }
+EXPORT_SYMBOL(srp_parse_tmo);
 
 static ssize_t show_reconnect_delay(struct device *dev,
                                     struct device_attribute *attr, char *buf)
@@ -396,6 +402,36 @@ static void srp_reconnect_work(struct work_struct *work)
         }
 }
 
+/**
+ * scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
+ * @shost: SCSI host for which to count the number of scsi_request_fn() callers.
+ *
+ * To do: add support for scsi-mq in this function.
+ */
+static int scsi_request_fn_active(struct Scsi_Host *shost)
+{
+        struct scsi_device *sdev;
+        struct request_queue *q;
+        int request_fn_active = 0;
+
+        shost_for_each_device(sdev, shost) {
+                q = sdev->request_queue;
+
+                spin_lock_irq(q->queue_lock);
+                request_fn_active += q->request_fn_active;
+                spin_unlock_irq(q->queue_lock);
+        }
+
+        return request_fn_active;
+}
+
+/* Wait until ongoing shost->hostt->queuecommand() calls have finished. */
+static void srp_wait_for_queuecommand(struct Scsi_Host *shost)
+{
+        while (scsi_request_fn_active(shost))
+                msleep(20);
+}
+
 static void __rport_fail_io_fast(struct srp_rport *rport)
 {
         struct Scsi_Host *shost = rport_to_shost(rport);
@@ -409,8 +445,10 @@ static void __rport_fail_io_fast(struct srp_rport *rport)
 
         /* Involve the LLD if possible to terminate all I/O on the rport. */
         i = to_srp_internal(shost->transportt);
-        if (i->f->terminate_rport_io)
+        if (i->f->terminate_rport_io) {
+                srp_wait_for_queuecommand(shost);
                 i->f->terminate_rport_io(rport);
+        }
 }
 
 /**
@@ -504,27 +542,6 @@ void srp_start_tl_fail_timers(struct srp_rport *rport)
 EXPORT_SYMBOL(srp_start_tl_fail_timers);
 
 /**
- * scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
- * @shost: SCSI host for which to count the number of scsi_request_fn() callers.
- */
-static int scsi_request_fn_active(struct Scsi_Host *shost)
-{
-        struct scsi_device *sdev;
-        struct request_queue *q;
-        int request_fn_active = 0;
-
-        shost_for_each_device(sdev, shost) {
-                q = sdev->request_queue;
-
-                spin_lock_irq(q->queue_lock);
-                request_fn_active += q->request_fn_active;
-                spin_unlock_irq(q->queue_lock);
-        }
-
-        return request_fn_active;
-}
-
-/**
  * srp_reconnect_rport() - reconnect to an SRP target port
  * @rport: SRP target port.
  *
@@ -559,8 +576,7 @@ int srp_reconnect_rport(struct srp_rport *rport)
         if (res)
                 goto out;
         scsi_target_block(&shost->shost_gendev);
-        while (scsi_request_fn_active(shost))
-                msleep(20);
+        srp_wait_for_queuecommand(shost);
         res = rport->state != SRP_RPORT_LOST ? i->f->reconnect(rport) : -ENODEV;
         pr_debug("%s (state %d): transport.reconnect() returned %d\n",
                  dev_name(&shost->shost_gendev), rport->state, res);
@@ -618,9 +634,11 @@ static enum blk_eh_timer_return srp_timed_out(struct scsi_cmnd *scmd)
         struct scsi_device *sdev = scmd->device;
         struct Scsi_Host *shost = sdev->host;
         struct srp_internal *i = to_srp_internal(shost->transportt);
+        struct srp_rport *rport = shost_to_rport(shost);
 
         pr_debug("timeout for sdev %s\n", dev_name(&sdev->sdev_gendev));
-        return i->f->reset_timer_if_blocked && scsi_device_blocked(sdev) ?
+        return rport->fast_io_fail_tmo < 0 && rport->dev_loss_tmo < 0 &&
+                i->f->reset_timer_if_blocked && scsi_device_blocked(sdev) ?
                 BLK_EH_RESET_TIMER : BLK_EH_NOT_HANDLED;
 }