Re: [PATCH 20/24] mpi3mr: wait for pending IO completions upon detection of VD IO timeout

[Hannes Reinecke <hare@suse.de>]

On 12/22/20 11:11 AM, Kashyap Desai wrote:
> Wait for (default 180 seconds) host IO completion if IO timeout is detected
> on VDs
> 
> Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
> Cc: sathya.prakash@broadcom.com
> ---
>   drivers/scsi/mpi3mr/mpi3mr.h    |  1 +
>   drivers/scsi/mpi3mr/mpi3mr_fw.c |  2 ++
>   drivers/scsi/mpi3mr/mpi3mr_os.c | 45 +++++++++++++++++++++++++++++++++
>   3 files changed, 48 insertions(+)
> 
> diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h
> index 1d51e42778f6..5554b0e49a58 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr.h
> +++ b/drivers/scsi/mpi3mr/mpi3mr.h
> @@ -102,6 +102,7 @@ extern struct list_head mrioc_list;
>   #define MPI3MR_RESET_HOST_IOWAIT_TIMEOUT	5
>   #define MPI3MR_TSUPDATE_INTERVAL		900
>   #define MPI3MR_DEFAULT_SHUTDOWN_TIME		120
> +#define	MPI3MR_RAID_ERRREC_RESET_TIMEOUT	180
>   
>   #define MPI3MR_WATCHDOG_INTERVAL		1000 /* in milli seconds */
>   
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> index 36a68c488019..b27e44f78544 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> @@ -3749,6 +3749,8 @@ int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc,
>   		}
>   	}
>   
> +	mpi3mr_wait_for_host_io(mrioc, MPI3MR_RESET_HOST_IOWAIT_TIMEOUT);
> +
>   	mpi3mr_ioc_disable_intr(mrioc);
>   
>   	if (snapdump) {
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
> index 8e665c70604d..1708aca1a5cd 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_os.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
> @@ -2437,6 +2437,43 @@ static void mpi3mr_print_pending_host_io(struct mpi3mr_ioc *mrioc)
>   	    mpi3mr_print_scmd, (void *)mrioc);
>   }
>   
> +/**
> + * mpi3mr_wait_for_host_io - block for I/Os to complete
> + * @mrioc: Adapter instance reference
> + * @timeout: time out in seconds
> + * Waits for pending I/Os for the given adapter to complete or
> + * to hit the timeout.
> + *
> + * Return: Nothing
> + */
> +void mpi3mr_wait_for_host_io(struct mpi3mr_ioc *mrioc, u32 timeout)
> +{
> +	enum mpi3mr_iocstate iocstate;
> +	int i = 0;
> +
> +	iocstate = mpi3mr_get_iocstate(mrioc);
> +	if (iocstate != MRIOC_STATE_READY)
> +		return;
> +
> +	if (!mpi3mr_get_fw_pending_ios(mrioc))
> +		return;
> +	ioc_info(mrioc,
> +	    "%s :Waiting for %d seconds prior to reset for %d I/O\n",
> +	    __func__, timeout, mpi3mr_get_fw_pending_ios(mrioc));
> +
> +	for (i = 0; i < timeout; i++) {
> +		if (!mpi3mr_get_fw_pending_ios(mrioc))
> +			break;
> +		iocstate = mpi3mr_get_iocstate(mrioc);
> +		if (iocstate != MRIOC_STATE_READY)
> +			break;
> +		msleep(1000);
> +	}
> +
> +	ioc_info(mrioc, "%s :Pending I/Os after wait is: %d\n", __func__,
> +	    mpi3mr_get_fw_pending_ios(mrioc));
> +}
> +
>   /**
>    * mpi3mr_eh_host_reset - Host reset error handling callback
>    * @scmd: SCSI command reference
> @@ -2462,6 +2499,14 @@ static int mpi3mr_eh_host_reset(struct scsi_cmnd *scmd)
>   		dev_type = stgt_priv_data->dev_type;
>   	}
>   
> +	if (dev_type == MPI3_DEVICE_DEVFORM_VD) {
> +		mpi3mr_wait_for_host_io(mrioc,
> +		    MPI3MR_RAID_ERRREC_RESET_TIMEOUT);
> +		if (!mpi3mr_get_fw_pending_ios(mrioc)) {
> +			retval = SUCCESS;
> +			goto out;
> +		}
> +	}
>   	mpi3mr_print_pending_host_io(mrioc);
>   	ret = mpi3mr_soft_reset_handler(mrioc,
>   	    MPI3MR_RESET_FROM_EH_HOS, 1);
> 
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer