scsi: lpfc: Fix lpfc nvme host rejecting IO with Not Ready message (2b75d0f9) · Commits · 戴 / test

In a link bounce scenario, a condition can occur where the discovery engine swaps an ndlp structure (address change for an nport). While the swap was successfully executed by the discovery engine, the driver did not properly detect a change in the ndlp bound to the nvme rport. This error resulted in the nvme host transport issuing an IO to the correct nvme rport, but the lpfc driver addressed a ndlp with an NLP_UNUSED status and failed the io. This resulting it it looking like there were missing namespaces and applications failed due to io errors. To fix, in lpfc_nvme_register_rport, rework the "rebind" case to break the nvme rport<->ndlp association when the ndlp already has an nrport. Then rebind the rport to the correct ndlp data and backpointers. [mkp: typo] Signed-off-by:

Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by:

James Smart <james.smart@broadcom.com> Reviewed-by:

Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/lpfc/lpfc_nvme.c

+28 −18

Original line number	Diff line number	Diff line
		@@ -2295,6 +2295,7 @@ lpfc_nvme_register_port(struct lpfc_vport vport, struct lpfc_nodelist ndlp)
		struct lpfc_nvme_rport *rport;
		struct nvme_fc_remote_port *remote_port;
		struct nvme_fc_port_info rpinfo;
		struct lpfc_nodelist *prev_ndlp;

		lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NVME_DISC,
		"6006 Register NVME PORT. DID x%06x nlptype x%x\n",
		@@ -2331,7 +2332,7 @@ lpfc_nvme_register_port(struct lpfc_vport vport, struct lpfc_nodelist ndlp)
		* new rport.
		*/
		rport = remote_port->private;
		if (ndlp->nrport == rport) {
		if (ndlp->nrport) {
		lpfc_printf_vlog(ndlp->vport, KERN_INFO,
		LOG_NVME_DISC,
		"6014 Rebinding lport to "
		@@ -2342,8 +2343,18 @@ lpfc_nvme_register_port(struct lpfc_vport vport, struct lpfc_nodelist ndlp)
		remote_port->port_role,
		ndlp->nlp_type,
		ndlp->nlp_DID);
		} else {
		/* New rport. */
		prev_ndlp = rport->ndlp;

		/* Sever the ndlp<->rport connection before dropping
		* the ndlp ref from register.
		*/
		ndlp->nrport = NULL;
		rport->ndlp = NULL;
		if (prev_ndlp)
		lpfc_nlp_put(ndlp);
		}

		/* Clean bind the rport to the ndlp. */
		rport->remoteport = remote_port;
		rport->lport = lport;
		rport->ndlp = lpfc_nlp_get(ndlp);
		@@ -2359,7 +2370,6 @@ lpfc_nvme_register_port(struct lpfc_vport vport, struct lpfc_nodelist ndlp)
		lport,
		rpinfo.node_name, rpinfo.port_name,
		rpinfo.port_id, rpinfo.port_role);
		}
		} else {
		lpfc_printf_vlog(vport, KERN_ERR,
		LOG_NVME_DISC \| LOG_NODE,

Admin message