scsi: lpfc: Introduce FC_RSCN_MEMENTO flag for tracking post RSCN completion

During an NVMe target reboot, the target may initialize itself as FCP only
during the first RSCN and shortly after trigger a second RSCN claiming NVMe
support.  The timing of these RSCNs occur before FCP-PRLI for the first
RSCN completes leading discovery issues over NVMe.

Change RSCN and NVME-PRLI send logic based on a new FC_RSCN_MEMENTO flag
that signals when lpfc_end_rscn() is completed and serves as a memento that
discovery was started from RSCN.

Link: https://lore.kernel.org/r/20220412222008.126521-20-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 0025760230e5182ffdeddb4e5a6aca470024394d..a62cf1a19280836a5a20f80a1aa2608b71fa3f68 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -604,6 +604,7 @@ struct lpfc_vport {
 #define FC_VFI_REGISTERED      0x800000 /* VFI is registered */
 #define FC_FDISC_COMPLETED     0x1000000/* FDISC completed */
 #define FC_DISC_DELAYED                0x2000000/* Delay NPort discovery */
+#define FC_RSCN_MEMENTO                0x4000000/* RSCN cmd processed */
 
        uint32_t ct_flags;
 #define FC_CT_RFF_ID           0x1      /* RFF_ID accepted by switch */

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index a7a47da4bb9dd55564efe6ed30794107acb67bf3..e734ae972d1e081a01c5e1f3efd2477885d6166b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1896,6 +1896,7 @@ lpfc_end_rscn(struct lpfc_vport *vport)
                else {
                        spin_lock_irq(shost->host_lock);
                        vport->fc_flag &= ~FC_RSCN_MODE;
+                       vport->fc_flag |= FC_RSCN_MEMENTO;
                        spin_unlock_irq(shost->host_lock);
                }
        }
@@ -2444,13 +2445,14 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        u32 local_nlp_type, elscmd;
 
        /*
-        * If we are in RSCN mode, the FC4 types supported from a
+        * If discovery was kicked off from RSCN mode,
+        * the FC4 types supported from a
         * previous GFT_ID command may not be accurate. So, if we
         * are a NVME Initiator, always look for the possibility of
         * the remote NPort beng a NVME Target.
         */
        if (phba->sli_rev == LPFC_SLI_REV4 &&
-           vport->fc_flag & FC_RSCN_MODE &&
+           vport->fc_flag & (FC_RSCN_MODE | FC_RSCN_MEMENTO) &&
            vport->nvmei_support)
                ndlp->nlp_fc4_type |= NLP_FC4_NVME;
        local_nlp_type = ndlp->nlp_fc4_type;
@@ -7988,6 +7990,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                if ((rscn_cnt < FC_MAX_HOLD_RSCN) &&
                    !(vport->fc_flag & FC_RSCN_DISCOVERY)) {
                        vport->fc_flag |= FC_RSCN_MODE;
+                       vport->fc_flag &= ~FC_RSCN_MEMENTO;
                        spin_unlock_irq(shost->host_lock);
                        if (rscn_cnt) {
                                cmd = vport->fc_rscn_id_list[rscn_cnt-1]->virt;
@@ -8037,6 +8040,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
 
        spin_lock_irq(shost->host_lock);
        vport->fc_flag |= FC_RSCN_MODE;
+       vport->fc_flag &= ~FC_RSCN_MEMENTO;
        spin_unlock_irq(shost->host_lock);
        vport->fc_rscn_id_list[vport->fc_rscn_id_cnt++] = pcmd;
        /* Indicate we are done walking fc_rscn_id_list on this vport */

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 2b877dff5ed4fb515602c227b69a53c7fe53fdd1..d6ff864b132b4b5b6a664fec9515781d74b9def5 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1343,7 +1343,8 @@ lpfc_linkup_port(struct lpfc_vport *vport)
 
        spin_lock_irq(shost->host_lock);
        vport->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI | FC_ABORT_DISCOVERY |
-                           FC_RSCN_MODE | FC_NLP_MORE | FC_RSCN_DISCOVERY);
+                           FC_RSCN_MEMENTO | FC_RSCN_MODE |
+                           FC_NLP_MORE | FC_RSCN_DISCOVERY);
        vport->fc_flag |= FC_NDISC_ACTIVE;
        vport->fc_ns_retry = 0;
        spin_unlock_irq(shost->host_lock);