Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d37306ca authored by Chaitra P B's avatar Chaitra P B Committed by Martin K. Petersen
Browse files

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


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

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: default avatarChaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 20a04433

drivers/scsi/mpt3sas/mpt3sas_base.c

+38 −14
Original line number Diff line number Diff line
@@ -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,

		issue_reset =

			mpt3sas_base_check_cmd_timeout(ioc,

				ioc->base_cmds.status, mpi_request,

				sizeof(Mpi2SasIoUnitControlRequest_t)/4);

		if (!(ioc->base_cmds.status & MPT3_CMD_RESET))

			issue_reset = true;

		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,

		issue_reset =

			mpt3sas_base_check_cmd_timeout(ioc,

				ioc->base_cmds.status, mpi_request,

				sizeof(Mpi2SepRequest_t)/4);

		if (!(ioc->base_cmds.status & MPT3_CMD_RESET))

			issue_reset = false;

		goto issue_host_reset;

	}

	if (ioc->base_cmds.status & MPT3_CMD_REPLY_VALID)

drivers/scsi/mpt3sas/mpt3sas_base.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/mpt3sas/mpt3sas_config.c

+3 −4
Original line number Diff line number Diff line
@@ -406,9 +406,8 @@ _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,

		mpt3sas_base_check_cmd_timeout(ioc,

			ioc->config_cmds.status, mpi_request,

			sizeof(Mpi2ConfigRequest_t)/4);

		retry_count++;

		if (ioc->config_cmds.smid == smid)

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+15 −23
Original line number Diff line number Diff line
@@ -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,

		issue_reset =

			mpt3sas_base_check_cmd_timeout(ioc,

				ioc->ctl_cmds.status, mpi_request,

				sizeof(Mpi2DiagBufferPostRequest_t)/4);

		if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))

			issue_reset = 1;

		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,

		*issue_reset = mpt3sas_base_check_cmd_timeout(ioc,

				ioc->ctl_cmds.status, mpi_request,

				sizeof(Mpi2DiagReleaseRequest_t)/4);

		if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))

			*issue_reset = 1;

		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,

		issue_reset =

			mpt3sas_base_check_cmd_timeout(ioc,

				ioc->ctl_cmds.status, mpi_request,

				sizeof(Mpi2DiagBufferPostRequest_t)/4);

		if (!(ioc->ctl_cmds.status & MPT3_CMD_RESET))

			issue_reset = 1;

		goto issue_host_reset;

	}

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+7 −9
Original line number Diff line number Diff line
@@ -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;

	}