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

Commit 3748694f authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Greg Kroah-Hartman
Browse files

scsi: mpt3sas: wait for and flush running commands on shutdown/unload 



commit c666d3be99c000bb889a33353e9be0fa5808d3de upstream.

This patch finishes all outstanding SCSI IO commands (but not other commands,
e.g., task management) in the shutdown and unload paths.

It first waits for the commands to complete (this is done after setting
'ioc->remove_host = 1 ', which prevents new commands to be queued) then it
flushes commands that might still be running.

This avoids triggering error handling (e.g., abort command) for all commands
possibly completed by the adapter after interrupts disabled.

[mauricfo: introduced something in commit message.]

Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Tested-by: default avatarMauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: default avatarMauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
[mauricfo: backport to linux-4.14.y (a few updates to context lines)]
Signed-off-by: default avatarMauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d72b269

drivers/scsi/mpt3sas/mpt3sas_base.c

+4 −4
Original line number Diff line number Diff line
@@ -5659,14 +5659,14 @@ _base_reset_handler(struct MPT3SAS_ADAPTER *ioc, int reset_phase) 
}



/**

 * _wait_for_commands_to_complete - reset controller

 * mpt3sas_wait_for_commands_to_complete - reset controller

 * @ioc: Pointer to MPT_ADAPTER structure

 *

 * This function waiting(3s) for all pending commands to complete

 * prior to putting controller in reset.

 */

static void

_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)

void

mpt3sas_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)

{

	u32 ioc_state;

	unsigned long flags;
@@ -5745,7 +5745,7 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc, 
			is_fault = 1;

	}

	_base_reset_handler(ioc, MPT3_IOC_PRE_RESET);

	_wait_for_commands_to_complete(ioc);

	mpt3sas_wait_for_commands_to_complete(ioc);

	_base_mask_interrupts(ioc);

	r = _base_make_ioc_ready(ioc, type);

	if (r)

drivers/scsi/mpt3sas/mpt3sas_base.h

+3 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,9 @@ void mpt3sas_base_update_missing_delay(struct MPT3SAS_ADAPTER *ioc, 


int mpt3sas_port_enable(struct MPT3SAS_ADAPTER *ioc);



void

mpt3sas_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc);





/* scsih shared API */

u8 mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+9 −1
Original line number Diff line number Diff line
@@ -3960,7 +3960,7 @@ _scsih_flush_running_cmds(struct MPT3SAS_ADAPTER *ioc) 
		_scsih_set_satl_pending(scmd, false);

		mpt3sas_base_free_smid(ioc, smid);

		scsi_dma_unmap(scmd);

		if (ioc->pci_error_recovery)

		if (ioc->pci_error_recovery || ioc->remove_host)

			scmd->result = DID_NO_CONNECT << 16;

		else

			scmd->result = DID_RESET << 16;
@@ -8243,6 +8243,10 @@ static void scsih_remove(struct pci_dev *pdev) 
	unsigned long flags;



	ioc->remove_host = 1;



	mpt3sas_wait_for_commands_to_complete(ioc);

	_scsih_flush_running_cmds(ioc);



	_scsih_fw_event_cleanup_queue(ioc);



	spin_lock_irqsave(&ioc->fw_event_lock, flags);
@@ -8313,6 +8317,10 @@ scsih_shutdown(struct pci_dev *pdev) 
	unsigned long flags;



	ioc->remove_host = 1;



	mpt3sas_wait_for_commands_to_complete(ioc);

	_scsih_flush_running_cmds(ioc);



	_scsih_fw_event_cleanup_queue(ioc);



	spin_lock_irqsave(&ioc->fw_event_lock, flags);