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

scsi: qla2xxx: Fix fabric scan hang 

On timeout, SRB pointer was cleared from outstanding command array and
dropped.  It was not allowed to go through the done process and cleanup.
This patch will abort the SRB where FW will return it with an error status
and resume the normal cleanup.

Link: https://lore.kernel.org/r/20191217220617.28084-3-hmadhani@marvell.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 3c75ad1d

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *); 


extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int);

extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *);

extern int qla24xx_async_abort_cmd(srb_t *, bool);



extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_init.c

+19 −15
Original line number Diff line number Diff line
@@ -49,16 +49,9 @@ qla2x00_sp_timeout(struct timer_list *t) 
{

	srb_t *sp = from_timer(sp, t, u.iocb_cmd.timer);

	struct srb_iocb *iocb;

	struct req_que *req;

	unsigned long flags;

	struct qla_hw_data *ha = sp->vha->hw;



	WARN_ON_ONCE(irqs_disabled());

	spin_lock_irqsave(&ha->hardware_lock, flags);

	req = sp->qpair->req;

	req->outstanding_cmds[sp->handle] = NULL;

	WARN_ON(irqs_disabled());

	iocb = &sp->u.iocb_cmd;

	spin_unlock_irqrestore(&ha->hardware_lock, flags);

	iocb->timeout(sp);

}
@@ -142,7 +135,7 @@ static void qla24xx_abort_sp_done(srb_t *sp, int res) 
		sp->free(sp);

}



static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)

{

	scsi_qla_host_t *vha = cmd_sp->vha;

	struct srb_iocb *abt_iocb;
@@ -242,6 +235,7 @@ qla2x00_async_iocb_timeout(void *data) 
	case SRB_NACK_PRLI:

	case SRB_NACK_LOGO:

	case SRB_CTRL_VP:

	default:

		rc = qla24xx_async_abort_cmd(sp, false);

		if (rc) {

			spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags);
@@ -258,10 +252,6 @@ qla2x00_async_iocb_timeout(void *data) 
			sp->done(sp, QLA_FUNCTION_TIMEOUT);

		}

		break;

	default:

		WARN_ON_ONCE(true);

		sp->done(sp, QLA_FUNCTION_TIMEOUT);

		break;

	}

}
@@ -1758,10 +1748,24 @@ qla2x00_tmf_iocb_timeout(void *data) 
{

	srb_t *sp = data;

	struct srb_iocb *tmf = &sp->u.iocb_cmd;

	int rc, h;

	unsigned long flags;



	rc = qla24xx_async_abort_cmd(sp, false);

	if (rc) {

		spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags);

		for (h = 1; h < sp->qpair->req->num_outstanding_cmds; h++) {

			if (sp->qpair->req->outstanding_cmds[h] == sp) {

				sp->qpair->req->outstanding_cmds[h] = NULL;

				break;

			}

		}

		spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags);

		tmf->u.tmf.comp_status = CS_TIMEOUT;

		tmf->u.tmf.data = QLA_FUNCTION_FAILED;

		complete(&tmf->u.tmf.comp);

	}

}



static void qla2x00_tmf_sp_done(srb_t *sp, int res)

{

drivers/scsi/qla2xxx/qla_iocb.c

+33 −8
Original line number Diff line number Diff line
@@ -2537,13 +2537,32 @@ qla2x00_els_dcmd_iocb_timeout(void *data) 
	fc_port_t *fcport = sp->fcport;

	struct scsi_qla_host *vha = sp->vha;

	struct srb_iocb *lio = &sp->u.iocb_cmd;

	unsigned long flags = 0;

	int res, h;



	ql_dbg(ql_dbg_io, vha, 0x3069,

	    "%s Timeout, hdl=%x, portid=%02x%02x%02x\n",

	    sp->name, sp->handle, fcport->d_id.b.domain, fcport->d_id.b.area,

	    fcport->d_id.b.al_pa);



	/* Abort the exchange */

	res = qla24xx_async_abort_cmd(sp, false);

	if (res) {

		ql_dbg(ql_dbg_io, vha, 0x3070,

		    "mbx abort_command failed.\n");

		spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags);

		for (h = 1; h < sp->qpair->req->num_outstanding_cmds; h++) {

			if (sp->qpair->req->outstanding_cmds[h] == sp) {

				sp->qpair->req->outstanding_cmds[h] = NULL;

				break;

			}

		}

		spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags);

		complete(&lio->u.els_logo.comp);

	} else {

		ql_dbg(ql_dbg_io, vha, 0x3071,

		    "mbx abort_command success.\n");

	}

}



static void qla2x00_els_dcmd_sp_done(srb_t *sp, int res)
@@ -2717,24 +2736,30 @@ qla2x00_els_dcmd2_iocb_timeout(void *data) 
	srb_t *sp = data;

	fc_port_t *fcport = sp->fcport;

	struct scsi_qla_host *vha = sp->vha;

	struct qla_hw_data *ha = vha->hw;

	unsigned long flags = 0;

	int res;

	int res, h;



	ql_dbg(ql_dbg_io + ql_dbg_disc, vha, 0x3069,

	    "%s hdl=%x ELS Timeout, %8phC portid=%06x\n",

	    sp->name, sp->handle, fcport->port_name, fcport->d_id.b24);



	/* Abort the exchange */

	spin_lock_irqsave(&ha->hardware_lock, flags);

	res = ha->isp_ops->abort_command(sp);

	res = qla24xx_async_abort_cmd(sp, false);

	ql_dbg(ql_dbg_io, vha, 0x3070,

	    "mbx abort_command %s\n",

	    (res == QLA_SUCCESS) ? "successful" : "failed");

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	if (res) {

		spin_lock_irqsave(sp->qpair->qp_lock_ptr, flags);

		for (h = 1; h < sp->qpair->req->num_outstanding_cmds; h++) {

			if (sp->qpair->req->outstanding_cmds[h] == sp) {

				sp->qpair->req->outstanding_cmds[h] = NULL;

				break;

			}

		}

		spin_unlock_irqrestore(sp->qpair->qp_lock_ptr, flags);

		sp->done(sp, QLA_FUNCTION_TIMEOUT);

	}

}



void qla2x00_els_dcmd2_free(scsi_qla_host_t *vha, struct els_plogi *els_plogi)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE