scsi: mpt3sas: Fix, False timeout prints for ioctl and other internal commands during...

When an ioctl is sent to FW, and if there is a controller reset issued
before ioctl gets completed, then in controller reset path all the pending
ioctl commands are terminated from "mpt3sas_ctl_reset_handler" function.
This will wake up the waiting ioctl commands in ioctl path and print
timeouts which are actually not timeouts.

Introduced "mpt3sas_base_check_cmd_timeout" function to check and print
whether command got timed out (or) terminated due to Host reset.

Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 569392d0d4c9e478b8e7d1fc745cb7e741005ff3..b397cc2d18f5485bfdbcf691b6659c76175420a2 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -101,6 +101,34 @@ MODULE_PARM_DESC(mpt3sas_fwfault_debug,
 static int
 _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc);
 
+/**
+ * mpt3sas_base_check_cmd_timeout - Function
+ *             to check timeout and command termination due
+ *             to Host reset.
+ *
+ * @ioc:       per adapter object.
+ * @status:    Status of issued command.
+ * @mpi_request:mf request pointer.
+ * @sz:                size of buffer.
+ *
+ * @Returns - 1/0 Reset to be done or Not
+ */
+u8
+mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc,
+               u8 status, void *mpi_request, int sz)
+{
+       u8 issue_reset = 0;
+
+       if (!(status & MPT3_CMD_RESET))
+               issue_reset = 1;
+
+       pr_err(MPT3SAS_FMT "Command %s\n", ioc->name,
+           ((issue_reset == 0) ? "terminated due to Host Reset" : "Timeout"));
+       _debug_dump_mf(mpi_request, sz);
+
+       return issue_reset;
+}
+
 /**
  * _scsih_set_fwfault_debug - global setting of ioc->fwfault_debug.
  *
@@ -5355,7 +5383,7 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,
 {
        u16 smid;
        u32 ioc_state;
-       bool issue_reset = false;
+       u8 issue_reset = 0;
        int rc;
        void *request;
        u16 wait_state_count;
@@ -5414,12 +5442,10 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,
            ioc->ioc_link_reset_in_progress)
                ioc->ioc_link_reset_in_progress = 0;
        if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n",
-                   ioc->name, __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2SasIoUnitControlRequest_t)/4);
-               if (!(ioc->base_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = true;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->base_cmds.status, mpi_request,
+                               sizeof(Mpi2SasIoUnitControlRequest_t)/4);
                goto issue_host_reset;
        }
        if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID)
@@ -5457,7 +5483,7 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc,
 {
        u16 smid;
        u32 ioc_state;
-       bool issue_reset = false;
+       u8 issue_reset = 0;
        int rc;
        void *request;
        u16 wait_state_count;
@@ -5510,12 +5536,10 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc,
        wait_for_completion_timeout(&ioc->base_cmds.done,
            msecs_to_jiffies(10000));
        if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n",
-                   ioc->name, __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2SepRequest_t)/4);
-               if (!(ioc->base_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = false;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->base_cmds.status, mpi_request,
+                               sizeof(Mpi2SepRequest_t)/4);
                goto issue_host_reset;
        }
        if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index f02974c0be4ad7aa61571797093a3e184c0ccb2c..ec222add0bb512ee3c973f3a1ad3dffc7f945814 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1482,6 +1482,8 @@ int mpt3sas_port_enable(struct MPT3SAS_ADAPTER *ioc);
 void
 mpt3sas_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc);
 
+u8 mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc,
+       u8 status, void *mpi_request, int sz);
 
 /* scsih shared API */
 struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,

diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index e87c76a832f64ca8ff1b002369df95cf4c609cab..0d87e7bef21538039acec7dabf6365fc095c1a28 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -406,10 +406,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
        mpt3sas_base_put_smid_default(ioc, smid);
        wait_for_completion_timeout(&ioc->config_cmds.done, timeout*HZ);
        if (!(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n",
-                   ioc->name, __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2ConfigRequest_t)/4);
+               mpt3sas_base_check_cmd_timeout(ioc,
+                       ioc->config_cmds.status, mpi_request,
+                       sizeof(Mpi2ConfigRequest_t)/4);
                retry_count++;
                if (ioc->config_cmds.smid == smid)
                        mpt3sas_base_free_smid(ioc, smid);

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 3269ef43f07ef8937cdcd219bb3d84f428c4ab93..1005249a0f25b9a55abcb5c74533f9e174687816 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -995,11 +995,10 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
                ioc->ignore_loginfos = 0;
        }
        if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n", ioc->name,
-                   __func__);
-               _debug_dump_mf(mpi_request, karg.data_sge_offset);
-               if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = 1;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->ctl_cmds.status, mpi_request,
+                               karg.data_sge_offset);
                goto issue_host_reset;
        }
 
@@ -1621,12 +1620,10 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
            MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
        if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n", ioc->name,
-                   __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2DiagBufferPostRequest_t)/4);
-               if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = 1;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->ctl_cmds.status, mpi_request,
+                               sizeof(Mpi2DiagBufferPostRequest_t)/4);
                goto issue_host_reset;
        }
 
@@ -1968,12 +1965,9 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
            MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
        if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n", ioc->name,
-                   __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2DiagReleaseRequest_t)/4);
-               if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))
-                       *issue_reset = 1;
+               *issue_reset = mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->ctl_cmds.status, mpi_request,
+                               sizeof(Mpi2DiagReleaseRequest_t)/4);
                rc = -EFAULT;
                goto out;
        }
@@ -2235,12 +2229,10 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
            MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
        if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n", ioc->name,
-                   __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2DiagBufferPostRequest_t)/4);
-               if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = 1;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->ctl_cmds.status, mpi_request,
+                               sizeof(Mpi2DiagBufferPostRequest_t)/4);
                goto issue_host_reset;
        }
 

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index bf578271a844a4d1a3d02edde1106c9b8929084e..23902ad3cae57d5a5d971f4580d7c4c755ae3457 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2709,11 +2709,9 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,
        mpt3sas_base_put_smid_hi_priority(ioc, smid, msix_task);
        wait_for_completion_timeout(&ioc->tm_cmds.done, timeout*HZ);
        if (!(ioc->tm_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n",
-                   ioc->name, __func__);
-               _debug_dump_mf(mpi_request,
-                   sizeof(Mpi2SCSITaskManagementRequest_t)/4);
-               if (!(ioc->tm_cmds.status & MPT3_CMD_RESET)) {
+               if (mpt3sas_base_check_cmd_timeout(ioc,
+                       ioc->tm_cmds.status, mpi_request,
+                       sizeof(Mpi2SCSITaskManagementRequest_t)/4)) {
                        rc = mpt3sas_base_hard_reset_handler(ioc,
                                        FORCE_BIG_HAMMER);
                        rc = (!rc) ? SUCCESS : FAILED;
@@ -7741,10 +7739,10 @@ _scsih_ir_fastpath(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phys_disk_num)
        wait_for_completion_timeout(&ioc->scsih_cmds.done, 10*HZ);
 
        if (!(ioc->scsih_cmds.status & MPT3_CMD_COMPLETE)) {
-               pr_err(MPT3SAS_FMT "%s: timeout\n",
-                   ioc->name, __func__);
-               if (!(ioc->scsih_cmds.status & MPT3_CMD_RESET))
-                       issue_reset = 1;
+               issue_reset =
+                       mpt3sas_base_check_cmd_timeout(ioc,
+                               ioc->scsih_cmds.status, mpi_request,
+                               sizeof(Mpi2RaidActionRequest_t)/4);
                rc = -EFAULT;
                goto out;
        }