mpt2sas, mpt3sas: Fail the host reset initiated due to discovery related I/O timeouts at driver load time

When a flaky disk is there in a topology then during driver load,
discovery related I/O times out; which results in SCSI error recovery
initiating host reset and then the controller won't see any disk.

In this patch, The driver would return FAILED status to the host reset
initiated due to discovery related I/O timeout if ioc->is_driver_loading
is set. This flag would be set until we exit out of scsih_scan_finished().
i.e.
During device discovery if one of the disk is flaky
(which responds to some discovery commands and doesn't respond to some)
the driver wouldn't perform host reset for discovery related I/O timeout.
Instead it would return Failure for the host reset resulting in the
flaky disk getting removed by the SCSI Mid layer,
so other disks would be added correctly.

Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

2 files changed, 17 insertions, 0 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 7000815277b1..a3140ed3cfe6 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -2729,9 +2729,18 @@ _scsih_host_reset(struct scsi_cmnd *scmd)
             ioc->name, scmd);
         scsi_print_command(scmd);
 
+        if (ioc->is_driver_loading) {
+                printk(MPT2SAS_INFO_FMT "Blocking the host reset\n",
+                                                          ioc->name);
+                r = FAILED;
+                goto out;
+        }
+
         retval = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,
             FORCE_BIG_HAMMER);
         r = (retval < 0) ? FAILED : SUCCESS;
+
+ out:
         printk(MPT2SAS_INFO_FMT "host reset: %s scmd(%p)\n",
             ioc->name, ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
 
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c3c0b45df102..5aa2ee96d0e6 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2392,9 +2392,17 @@ _scsih_host_reset(struct scsi_cmnd *scmd)
             ioc->name, scmd);
         scsi_print_command(scmd);
 
+        if (ioc->is_driver_loading) {
+                pr_info(MPT3SAS_FMT "Blocking the host reset\n",
+                    ioc->name);
+                r = FAILED;
+                goto out;
+        }
+
         retval = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
             FORCE_BIG_HAMMER);
         r = (retval < 0) ? FAILED : SUCCESS;
+out:
         pr_info(MPT3SAS_FMT "host reset: %s scmd(%p)\n",
             ioc->name, ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);