Commit 51f8e43e authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix NVMe ABTS in response to receiving an ABTS 

When the port, running as a nvme target, receives an ABTS, it submits
commands to the adapter to Abort i/o outstanding in the adapter. The Abort
command formatting routine left a command field set to zero, which
instructs the adapter to generate an ABTS on the wire as part of cleaning
up the I/O. This is common operation for an initiator, but not for a
target.

Fix the driver to check whether an ABTS had been received for the I/O, and
if so, change the Abort command formatting so that the ABTS generation is
disabled (IA=1). No need to ABTS it when the other side already has.

Also refactored the code such that there is a single routine being used for
nvme or nvmet ABORT requests, and IA is an argument.

Link: https://lore.kernel.org/r/20190922035906.10977-11-jsmart2021@gmail.com


Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3f97aed6

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ void lpfc_release_io_buf(struct lpfc_hba *phba, struct lpfc_io_buf *ncmd, 
void lpfc_nvme_cmd_template(void);

void lpfc_nvmet_cmd_template(void);

void lpfc_nvme_cancel_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn);

void lpfc_nvme_prep_abort_wqe(struct lpfc_iocbq *pwqeq, u16 xritag, u8 opt);

extern int lpfc_enable_nvmet_cnt;

extern unsigned long long lpfc_enable_nvmet[];

extern int lpfc_no_hba_reset_cnt;

drivers/scsi/lpfc/lpfc_hw4.h

+1 −0
Original line number Diff line number Diff line
@@ -4659,6 +4659,7 @@ struct create_xri_wqe { 
	uint32_t rsvd_12_15[4];         /* word 12-15 */

};



#define INHIBIT_ABORT 1

#define T_REQUEST_TAG 3

#define T_XRI_TAG 1

drivers/scsi/lpfc/lpfc_nvme.c

+41 −32
Original line number Diff line number Diff line
@@ -195,6 +195,46 @@ lpfc_nvme_cmd_template(void) 
	/* Word 12, 13, 14, 15 - is zero */

}



/**

 * lpfc_nvme_prep_abort_wqe - set up 'abort' work queue entry.

 * @pwqeq: Pointer to command iocb.

 * @xritag: Tag that  uniqely identifies the local exchange resource.

 * @opt: Option bits -

 *		bit 0 = inhibit sending abts on the link

 *

 * This function is called with hbalock held.

 **/

void

lpfc_nvme_prep_abort_wqe(struct lpfc_iocbq *pwqeq, u16 xritag, u8 opt)

{

	union lpfc_wqe128 *wqe = &pwqeq->wqe;



	/* WQEs are reused.  Clear stale data and set key fields to

	 * zero like ia, iaab, iaar, xri_tag, and ctxt_tag.

	 */

	memset(wqe, 0, sizeof(*wqe));



	if (opt & INHIBIT_ABORT)

		bf_set(abort_cmd_ia, &wqe->abort_cmd, 1);

	/* Abort specified xri tag, with the mask deliberately zeroed */

	bf_set(abort_cmd_criteria, &wqe->abort_cmd, T_XRI_TAG);



	bf_set(wqe_cmnd, &wqe->abort_cmd.wqe_com, CMD_ABORT_XRI_CX);



	/* Abort the IO associated with this outstanding exchange ID. */

	wqe->abort_cmd.wqe_com.abort_tag = xritag;



	/* iotag for the wqe completion. */

	bf_set(wqe_reqtag, &wqe->abort_cmd.wqe_com, pwqeq->iotag);



	bf_set(wqe_qosd, &wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_lenloc, &wqe->abort_cmd.wqe_com, LPFC_WQE_LENLOC_NONE);



	bf_set(wqe_cmd_type, &wqe->abort_cmd.wqe_com, OTHER_COMMAND);

	bf_set(wqe_wqec, &wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_cqid, &wqe->abort_cmd.wqe_com, LPFC_WQE_CQ_ID_DEFAULT);

}



/**

 * lpfc_nvme_create_queue -

 * @lpfc_pnvme: Pointer to the driver's nvme instance data
@@ -1791,7 +1831,6 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, 
	struct lpfc_iocbq *abts_buf;

	struct lpfc_iocbq *nvmereq_wqe;

	struct lpfc_nvme_fcpreq_priv *freqpriv;

	union lpfc_wqe128 *abts_wqe;

	unsigned long flags;

	int ret_val;
@@ -1912,37 +1951,7 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, 
	/* Ready - mark outstanding as aborted by driver. */

	nvmereq_wqe->iocb_flag |= LPFC_DRIVER_ABORTED;



	/* Complete prepping the abort wqe and issue to the FW. */

	abts_wqe = &abts_buf->wqe;



	/* WQEs are reused.  Clear stale data and set key fields to

	 * zero like ia, iaab, iaar, xri_tag, and ctxt_tag.

	 */

	memset(abts_wqe, 0, sizeof(*abts_wqe));

	bf_set(abort_cmd_criteria, &abts_wqe->abort_cmd, T_XRI_TAG);



	/* word 7 */

	bf_set(wqe_cmnd, &abts_wqe->abort_cmd.wqe_com, CMD_ABORT_XRI_CX);

	bf_set(wqe_class, &abts_wqe->abort_cmd.wqe_com,

	       nvmereq_wqe->iocb.ulpClass);



	/* word 8 - tell the FW to abort the IO associated with this

	 * outstanding exchange ID.

	 */

	abts_wqe->abort_cmd.wqe_com.abort_tag = nvmereq_wqe->sli4_xritag;



	/* word 9 - this is the iotag for the abts_wqe completion. */

	bf_set(wqe_reqtag, &abts_wqe->abort_cmd.wqe_com,

	       abts_buf->iotag);



	/* word 10 */

	bf_set(wqe_qosd, &abts_wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_lenloc, &abts_wqe->abort_cmd.wqe_com, LPFC_WQE_LENLOC_NONE);



	/* word 11 */

	bf_set(wqe_cmd_type, &abts_wqe->abort_cmd.wqe_com, OTHER_COMMAND);

	bf_set(wqe_wqec, &abts_wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_cqid, &abts_wqe->abort_cmd.wqe_com, LPFC_WQE_CQ_ID_DEFAULT);

	lpfc_nvme_prep_abort_wqe(abts_buf, nvmereq_wqe->sli4_xritag, 0);



	/* ABTS WQE must go to the same WQ as the WQE to be aborted */

	abts_buf->iocb_flag |= LPFC_IO_NVME;

drivers/scsi/lpfc/lpfc_nvmet.c

+3 −31
Original line number Diff line number Diff line
@@ -3239,9 +3239,9 @@ lpfc_nvmet_sol_fcp_issue_abort(struct lpfc_hba *phba, 
{

	struct lpfc_nvmet_tgtport *tgtp;

	struct lpfc_iocbq *abts_wqeq;

	union lpfc_wqe128 *abts_wqe;

	struct lpfc_nodelist *ndlp;

	unsigned long flags;

	u8 opt;

	int rc;



	tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
@@ -3280,8 +3280,8 @@ lpfc_nvmet_sol_fcp_issue_abort(struct lpfc_hba *phba, 
		return 0;

	}

	abts_wqeq = ctxp->abort_wqeq;

	abts_wqe = &abts_wqeq->wqe;

	ctxp->state = LPFC_NVMET_STE_ABORT;

	opt = (ctxp->flag & LPFC_NVMET_ABTS_RCV) ? INHIBIT_ABORT : 0;

	spin_unlock_irqrestore(&ctxp->ctxlock, flags);



	/* Announce entry to new IO submit field. */
@@ -3327,35 +3327,7 @@ lpfc_nvmet_sol_fcp_issue_abort(struct lpfc_hba *phba, 
	/* Ready - mark outstanding as aborted by driver. */

	abts_wqeq->iocb_flag |= LPFC_DRIVER_ABORTED;



	/* WQEs are reused.  Clear stale data and set key fields to

	 * zero like ia, iaab, iaar, xri_tag, and ctxt_tag.

	 */

	memset(abts_wqe, 0, sizeof(*abts_wqe));



	/* word 3 */

	bf_set(abort_cmd_criteria, &abts_wqe->abort_cmd, T_XRI_TAG);



	/* word 7 */

	bf_set(wqe_ct, &abts_wqe->abort_cmd.wqe_com, 0);

	bf_set(wqe_cmnd, &abts_wqe->abort_cmd.wqe_com, CMD_ABORT_XRI_CX);



	/* word 8 - tell the FW to abort the IO associated with this

	 * outstanding exchange ID.

	 */

	abts_wqe->abort_cmd.wqe_com.abort_tag = ctxp->wqeq->sli4_xritag;



	/* word 9 - this is the iotag for the abts_wqe completion. */

	bf_set(wqe_reqtag, &abts_wqe->abort_cmd.wqe_com,

	       abts_wqeq->iotag);



	/* word 10 */

	bf_set(wqe_qosd, &abts_wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_lenloc, &abts_wqe->abort_cmd.wqe_com, LPFC_WQE_LENLOC_NONE);



	/* word 11 */

	bf_set(wqe_cmd_type, &abts_wqe->abort_cmd.wqe_com, OTHER_COMMAND);

	bf_set(wqe_wqec, &abts_wqe->abort_cmd.wqe_com, 1);

	bf_set(wqe_cqid, &abts_wqe->abort_cmd.wqe_com, LPFC_WQE_CQ_ID_DEFAULT);

	lpfc_nvme_prep_abort_wqe(abts_wqeq, ctxp->wqeq->sli4_xritag, opt);



	/* ABTS WQE must go to the same WQ as the WQE to be aborted */

	abts_wqeq->hba_wqidx = ctxp->wqeq->hba_wqidx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE