Skip to content

L
linux
Commit c6bdb6a1 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files
Options

scsi: mpt3sas: Print function name in which cmd timed out 

Print the function name in which MPT command got timed out. This will
facilitate debugging in which path corresponding MPT command got timeout in
first failure instance of log itself.

Link: https://lore.kernel.org/r/20191226111333.26131-9-sreekanth.reddy@broadcom.comSigned-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5b061980
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 33 deletions
drivers/scsi/mpt3sas/mpt3sas_base.c
View file @ c6bdb6a1
...@@ -5984,10 +5984,9 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc, ...@@ -5984,10 +5984,9 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,
ioc->ioc_link_reset_in_progress) ioc->ioc_link_reset_in_progress)
ioc->ioc_link_reset_in_progress = 0; ioc->ioc_link_reset_in_progress = 0;
if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc, ioc->base_cmds.status,
mpt3sas_base_check_cmd_timeout(ioc, mpi_request, sizeof(Mpi2SasIoUnitControlRequest_t)/4,
ioc->base_cmds.status, mpi_request, issue_reset);
sizeof(Mpi2SasIoUnitControlRequest_t)/4);
goto issue_host_reset; goto issue_host_reset;
} }
if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID) if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID)
...@@ -6060,10 +6059,9 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc, ...@@ -6060,10 +6059,9 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc,
wait_for_completion_timeout(&ioc->base_cmds.done, wait_for_completion_timeout(&ioc->base_cmds.done,
msecs_to_jiffies(10000)); msecs_to_jiffies(10000));
if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc,
mpt3sas_base_check_cmd_timeout(ioc, ioc->base_cmds.status, mpi_request,
ioc->base_cmds.status, mpi_request, sizeof(Mpi2SepRequest_t)/4, issue_reset);
sizeof(Mpi2SepRequest_t)/4);
goto issue_host_reset; goto issue_host_reset;
} }
if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID) if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID)
......
drivers/scsi/mpt3sas/mpt3sas_base.h
View file @ c6bdb6a1
...@@ -1579,6 +1579,11 @@ mpt3sas_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc); ...@@ -1579,6 +1579,11 @@ mpt3sas_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc);
u8 mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc, u8 mpt3sas_base_check_cmd_timeout(struct MPT3SAS_ADAPTER *ioc,
u8 status, void *mpi_request, int sz); u8 status, void *mpi_request, int sz);
#define mpt3sas_check_cmd_timeout(ioc, status, mpi_request, sz, issue_reset) \
do { ioc_err(ioc, "In func: %s\n", __func__); \
issue_reset = mpt3sas_base_check_cmd_timeout(ioc, \
status, mpi_request, sz); } while (0)
int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count); int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count);
/* scsih shared API */ /* scsih shared API */
......
drivers/scsi/mpt3sas/mpt3sas_config.c
View file @ c6bdb6a1
...@@ -303,6 +303,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t ...@@ -303,6 +303,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
u8 retry_count, issue_host_reset = 0; u8 retry_count, issue_host_reset = 0;
struct config_request mem; struct config_request mem;
u32 ioc_status = UINT_MAX; u32 ioc_status = UINT_MAX;
u8 issue_reset = 0;
mutex_lock(&ioc->config_cmds.mutex); mutex_lock(&ioc->config_cmds.mutex);
if (ioc->config_cmds.status != MPT3_CMD_NOT_USED) { if (ioc->config_cmds.status != MPT3_CMD_NOT_USED) {
...@@ -385,9 +386,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t ...@@ -385,9 +386,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
if (!(ioc->logging_level & MPT_DEBUG_CONFIG)) if (!(ioc->logging_level & MPT_DEBUG_CONFIG))
_config_display_some_debug(ioc, _config_display_some_debug(ioc,
smid, "config_request", NULL); smid, "config_request", NULL);
mpt3sas_base_check_cmd_timeout(ioc, mpt3sas_check_cmd_timeout(ioc,
ioc->config_cmds.status, mpi_request, ioc->config_cmds.status, mpi_request,
sizeof(Mpi2ConfigRequest_t)/4); sizeof(Mpi2ConfigRequest_t)/4, issue_reset);
retry_count++; retry_count++;
if (ioc->config_cmds.smid == smid) if (ioc->config_cmds.smid == smid)
mpt3sas_base_free_smid(ioc, smid); mpt3sas_base_free_smid(ioc, smid);
......
drivers/scsi/mpt3sas/mpt3sas_ctl.c
View file @ c6bdb6a1
...@@ -1028,10 +1028,9 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, ...@@ -1028,10 +1028,9 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
ioc->ignore_loginfos = 0; ioc->ignore_loginfos = 0;
} }
if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc,
mpt3sas_base_check_cmd_timeout(ioc, ioc->ctl_cmds.status, mpi_request,
ioc->ctl_cmds.status, mpi_request, karg.data_sge_offset, issue_reset);
karg.data_sge_offset);
goto issue_host_reset; goto issue_host_reset;
} }
...@@ -1741,10 +1740,9 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc, ...@@ -1741,10 +1740,9 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ); MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc,
mpt3sas_base_check_cmd_timeout(ioc, ioc->ctl_cmds.status, mpi_request,
ioc->ctl_cmds.status, mpi_request, sizeof(Mpi2DiagBufferPostRequest_t)/4, issue_reset);
sizeof(Mpi2DiagBufferPostRequest_t)/4);
goto issue_host_reset; goto issue_host_reset;
} }
...@@ -2116,6 +2114,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type, ...@@ -2116,6 +2114,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
u16 ioc_status; u16 ioc_status;
u32 ioc_state; u32 ioc_state;
int rc; int rc;
u8 reset_needed = 0;
dctlprintk(ioc, ioc_info(ioc, "%s\n", dctlprintk(ioc, ioc_info(ioc, "%s\n",
__func__)); __func__));
...@@ -2123,6 +2122,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type, ...@@ -2123,6 +2122,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
rc = 0; rc = 0;
*issue_reset = 0; *issue_reset = 0;
ioc_state = mpt3sas_base_get_iocstate(ioc, 1); ioc_state = mpt3sas_base_get_iocstate(ioc, 1);
if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
if (ioc->diag_buffer_status[buffer_type] & if (ioc->diag_buffer_status[buffer_type] &
...@@ -2165,9 +2165,10 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type, ...@@ -2165,9 +2165,10 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ); MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
*issue_reset = mpt3sas_base_check_cmd_timeout(ioc, mpt3sas_check_cmd_timeout(ioc,
ioc->ctl_cmds.status, mpi_request, ioc->ctl_cmds.status, mpi_request,
sizeof(Mpi2DiagReleaseRequest_t)/4); sizeof(Mpi2DiagReleaseRequest_t)/4, reset_needed);
*issue_reset = reset_needed;
rc = -EFAULT; rc = -EFAULT;
goto out; goto out;
} }
...@@ -2425,10 +2426,9 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg) ...@@ -2425,10 +2426,9 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ); MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc,
mpt3sas_base_check_cmd_timeout(ioc, ioc->ctl_cmds.status, mpi_request,
ioc->ctl_cmds.status, mpi_request, sizeof(Mpi2DiagBufferPostRequest_t)/4, issue_reset);
sizeof(Mpi2DiagBufferPostRequest_t)/4);
goto issue_host_reset; goto issue_host_reset;
} }
......
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View file @ c6bdb6a1
...@@ -2728,6 +2728,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun, ...@@ -2728,6 +2728,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,
u16 smid = 0; u16 smid = 0;
u32 ioc_state; u32 ioc_state;
int rc; int rc;
u8 issue_reset = 0;
lockdep_assert_held(&ioc->tm_cmds.mutex); lockdep_assert_held(&ioc->tm_cmds.mutex);
...@@ -2787,9 +2788,10 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun, ...@@ -2787,9 +2788,10 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,
ioc->put_smid_hi_priority(ioc, smid, msix_task); ioc->put_smid_hi_priority(ioc, smid, msix_task);
wait_for_completion_timeout(&ioc->tm_cmds.done, timeout*HZ); wait_for_completion_timeout(&ioc->tm_cmds.done, timeout*HZ);
if (!(ioc->tm_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->tm_cmds.status & MPT3_CMD_COMPLETE)) {
if (mpt3sas_base_check_cmd_timeout(ioc, mpt3sas_check_cmd_timeout(ioc,
ioc->tm_cmds.status, mpi_request, ioc->tm_cmds.status, mpi_request,
sizeof(Mpi2SCSITaskManagementRequest_t)/4)) { sizeof(Mpi2SCSITaskManagementRequest_t)/4, issue_reset);
if (issue_reset) {
rc = mpt3sas_base_hard_reset_handler(ioc, rc = mpt3sas_base_hard_reset_handler(ioc,
FORCE_BIG_HAMMER); FORCE_BIG_HAMMER);
rc = (!rc) ? SUCCESS : FAILED; rc = (!rc) ? SUCCESS : FAILED;
...@@ -7757,10 +7759,9 @@ _scsih_ir_fastpath(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phys_disk_num) ...@@ -7757,10 +7759,9 @@ _scsih_ir_fastpath(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phys_disk_num)
wait_for_completion_timeout(&ioc->scsih_cmds.done, 10*HZ); wait_for_completion_timeout(&ioc->scsih_cmds.done, 10*HZ);
if (!(ioc->scsih_cmds.status & MPT3_CMD_COMPLETE)) { if (!(ioc->scsih_cmds.status & MPT3_CMD_COMPLETE)) {
issue_reset = mpt3sas_check_cmd_timeout(ioc,
mpt3sas_base_check_cmd_timeout(ioc, ioc->scsih_cmds.status, mpi_request,
ioc->scsih_cmds.status, mpi_request, sizeof(Mpi2RaidActionRequest_t)/4, issue_reset);
sizeof(Mpi2RaidActionRequest_t)/4);
rc = -EFAULT; rc = -EFAULT;
goto out; goto out;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7