Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32b93865 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix nvmet target abort cmd matching 



After receiving an unsolicited ABTS (meaning rxid is 0xFFFF), the driver
used the oxid from the initiator to match against a local xri which may
have been allocated for the io. The xri would be the rxid - it's an invalid
check resulting in the command not being matched or erroneously matched.

Change the lookup to use the oxid and the SID to match against received
IO's original values.

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 2d71dc8e

drivers/scsi/lpfc/lpfc_nvmet.c

+8 −2
Original line number Diff line number Diff line
@@ -1497,6 +1497,7 @@ void 
lpfc_sli4_nvmet_xri_aborted(struct lpfc_hba *phba,

			    struct sli4_wcqe_xri_aborted *axri)

{

#if (IS_ENABLED(CONFIG_NVME_TARGET_FC))

	uint16_t xri = bf_get(lpfc_wcqe_xa_xri, axri);

	uint16_t rxid = bf_get(lpfc_wcqe_xa_remote_xid, axri);

	struct lpfc_nvmet_rcv_ctx *ctxp, *next_ctxp;
@@ -1562,6 +1563,7 @@ lpfc_sli4_nvmet_xri_aborted(struct lpfc_hba *phba, 
	}

	spin_unlock(&phba->sli4_hba.abts_nvmet_buf_list_lock);

	spin_unlock_irqrestore(&phba->hbalock, iflag);

#endif

}



int
@@ -1572,19 +1574,23 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport, 
	struct lpfc_hba *phba = vport->phba;

	struct lpfc_nvmet_rcv_ctx *ctxp, *next_ctxp;

	struct nvmefc_tgt_fcp_req *rsp;

	uint32_t sid;

	uint16_t xri;

	unsigned long iflag = 0;



	xri = be16_to_cpu(fc_hdr->fh_ox_id);

	sid = sli4_sid_from_fc_hdr(fc_hdr);



	spin_lock_irqsave(&phba->hbalock, iflag);

	spin_lock(&phba->sli4_hba.abts_nvmet_buf_list_lock);

	list_for_each_entry_safe(ctxp, next_ctxp,

				 &phba->sli4_hba.lpfc_abts_nvmet_ctx_list,

				 list) {

		if (ctxp->ctxbuf->sglq->sli4_xritag != xri)

		if (ctxp->oxid != xri || ctxp->sid != sid)

			continue;



		xri = ctxp->ctxbuf->sglq->sli4_xritag;



		spin_unlock(&phba->sli4_hba.abts_nvmet_buf_list_lock);

		spin_unlock_irqrestore(&phba->hbalock, iflag);
@@ -1613,7 +1619,7 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport, 
			 xri, raw_smp_processor_id(), 1);



	lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,

			"6320 NVMET Rcv ABTS:rjt xri x%x\n", xri);

			"6320 NVMET Rcv ABTS:rjt xid x%x\n", xri);



	/* Respond with BA_RJT accordingly */

	lpfc_sli4_seq_abort_rsp(vport, fc_hdr, 0);