Commit 71c80b75 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Do command completion on abort timeout 

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: 219d27d7 ("scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands")
Cc: stable@vger.kernel.org # 5.2
Link: https://lore.kernel.org/r/20191105150657.8092-3-hmadhani@marvell.com


Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 983f1276

drivers/scsi/qla2xxx/qla_def.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/qla2xxx/qla_init.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE