diff mbox series

[09/20] lpfc: Fix discovery failures when target device connectivity bounces

Message ID 20190922035906.10977-10-jsmart2021@gmail.com (mailing list archive)
State Accepted
Headers show
Series lpfc: Update lpfc to revision 12.4.0.1 | expand

Commit Message

James Smart Sept. 22, 2019, 3:58 a.m. UTC 
An issue was seen discovering all SCSI Luns when a target device
undergoes link bounce.

The driver currently does not qualify the FC4 support on the target.
Therefore it will send a SCSI PRLI and an NVMe PRLI. The expectation
is that the target will reject the PRLI if it is not supported. If a
PRLI times out, the driver will retry. The driver will not proceed
with the device until both SCSI and NVMe PRLIs are resolved.
In the failure case, the device is FCP only and does not respond to
the NVMe PRLI, thus initiating the wait/retry loop in the driver.
During that time, a RSCN is received (device bounced) causing the
driver to issue a GID_FT.  The GID_FT response comes back before the
PRLI mess is resolved and it prematurely cancels the PRLI retry
logic and leaves the device in a STE_PRLI_ISSUE state. Discovery
with the target never completes or resets.

Fix by resetting the node state back to STE_NPR_NODE when GID_FT
completes, thereby restarting the discovery process for the node.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
---
 drivers/scsi/lpfc/lpfc_hbadisc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 144786947b63..f483b3aea22b 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -5444,9 +5444,14 @@  lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
 			/* If we've already received a PLOGI from this NPort
 			 * we don't need to try to discover it again.
 			 */
-			if (ndlp->nlp_flag & NLP_RCV_PLOGI)
+			if (ndlp->nlp_flag & NLP_RCV_PLOGI &&
+			    !(ndlp->nlp_type &
+			     (NLP_FCP_TARGET | NLP_NVME_TARGET)))
 				return NULL;
 
+			ndlp->nlp_prev_state = ndlp->nlp_state;
+			lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+
 			spin_lock_irq(shost->host_lock);
 			ndlp->nlp_flag |= NLP_NPR_2B_DISC;
 			spin_unlock_irq(shost->host_lock);