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

scsi: lpfc: Refresh ndlp when a new PRLI is received in the PRLI issue state 

Testing with target ports coming and going, the driver eventually reached a
state where it no longer discovered the target. When the driver has issued
a PRLI and receives a PRLI from the target, it is not properly updating the
node's initiator/target role flags. Thus, when a subsequent RSCN is
received for a target loss, the driver mis-identifies the target as an
initiator and does not initiate LUN scanning.

Fix by always refreshing the ndlp with the latest PRLI state information
whenever a PRLI is processed.  Also clear the ndlp flags when processing a
PLOGI so that there is no carry over through a re-login.

Link: https://lore.kernel.org/r/20210104180240.46824-4-jsmart2021@gmail.com


Co-developed-by: default avatarDick Kennedy <dick.kennedy@broadcom.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 d2f2547e

drivers/scsi/lpfc/lpfc_nportdisc.c

+11 −0
Original line number Diff line number Diff line
@@ -471,6 +471,15 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		 */

		if (!(ndlp->nlp_type & NLP_FABRIC) &&

		    !(phba->nvmet_support)) {

			/* Clear ndlp info, since follow up PRLI may have

			 * updated ndlp information

			 */

			ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);

			ndlp->nlp_type &= ~(NLP_NVME_TARGET | NLP_NVME_INITIATOR);

			ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;

			ndlp->nlp_nvme_info &= ~NLP_NVME_NSLER;

			ndlp->nlp_flag &= ~NLP_FIRSTBURST;



			lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb,

					 ndlp, NULL);

			return 1;
@@ -499,6 +508,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);

	ndlp->nlp_type &= ~(NLP_NVME_TARGET | NLP_NVME_INITIATOR);

	ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;

	ndlp->nlp_nvme_info &= ~NLP_NVME_NSLER;

	ndlp->nlp_flag &= ~NLP_FIRSTBURST;



	login_mbox = NULL;
@@ -2107,6 +2117,7 @@ lpfc_rcv_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 


	if (!lpfc_rcv_prli_support_check(vport, ndlp, cmdiocb))

		return ndlp->nlp_state;

	lpfc_rcv_prli(vport, ndlp, cmdiocb);

	lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);

	return ndlp->nlp_state;

}