On Tue, 2019-11-05 at 07:06 -0800, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@xxxxxxxxxxx>
>
> On switch, fabric and mgt command timeout, driver
> send Abort to tell FW to return the original command.
> If abort is timeout, then return both Abort and
> original command for cleanup.
>
> Fixes: 219d27d7147e0 ("scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands")
> Cc: stable@xxxxxxxxxxxxxxx # 5.2
> Signed-off-by: Quinn Tran <qutran@xxxxxxxxxxx>
> Signed-off-by: Himanshu Madhani <hmadhani@xxxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_def.h | 1 +
> drivers/scsi/qla2xxx/qla_init.c | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
> index 721ee7f09b39..ef9bb3c7ad6f 100644
> --- a/drivers/scsi/qla2xxx/qla_def.h
> +++ b/drivers/scsi/qla2xxx/qla_def.h
> @@ -604,6 +604,7 @@ typedef struct srb {
> const char *name;
> int iocbs;
> struct qla_qpair *qpair;
> + struct srb *cmd_sp;
> struct list_head elem;
> u32 gen1; /* scratch */
> u32 gen2; /* scratch */
> diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
> index 5db8ad832893..7fdbe041cc19 100644
> --- a/drivers/scsi/qla2xxx/qla_init.c
> +++ b/drivers/scsi/qla2xxx/qla_init.c
> @@ -101,8 +101,22 @@ static void qla24xx_abort_iocb_timeout(void *data)
> u32 handle;
> unsigned long flags;
>
> + if (sp->cmd_sp)
> + ql_dbg(ql_dbg_async, sp->vha, 0x507c,
> + "Abort timeout - cmd hdl=%x, cmd type=%x hdl=%x, type=%x\n",
> + sp->cmd_sp->handle, sp->cmd_sp->type,
> + sp->handle, sp->type);
> + else
> + ql_dbg(ql_dbg_async, sp->vha, 0x507c,
> + "Abort timeout 2 - hdl=%x, type=%x\n",
> + sp->handle, sp->type);
> +
> spin_lock_irqsave(qpair->qp_lock_ptr, flags);
> for (handle = 1; handle < qpair->req->num_outstanding_cmds; handle++) {
> + if (sp->cmd_sp && (qpair->req->outstanding_cmds[handle] ==
> + sp->cmd_sp))
> + qpair->req->outstanding_cmds[handle] = NULL;
> +
> /* removing the abort */
> if (qpair->req->outstanding_cmds[handle] == sp) {
> qpair->req->outstanding_cmds[handle] = NULL;
> @@ -111,6 +125,9 @@ static void qla24xx_abort_iocb_timeout(void *data)
> }
> spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);
>
> + if (sp->cmd_sp)
> + sp->cmd_sp->done(sp->cmd_sp, QLA_OS_TIMER_EXPIRED);
> +
> abt->u.abt.comp_status = CS_TIMEOUT;
> sp->done(sp, QLA_OS_TIMER_EXPIRED);
> }
> @@ -142,6 +159,7 @@ static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)
> sp->type = SRB_ABT_CMD;
> sp->name = "abort";
> sp->qpair = cmd_sp->qpair;
> + sp->cmd_sp = cmd_sp;
> if (wait)
> sp->flags = SRB_WAKEUP_ON_COMP;
>
Reviewed-by: Ewan D. Milne <emilne@xxxxxxxxxx>
