scsi: lpfc: Fix SCSI LUN discovery when SCSI and NVME enabled

[ Upstream commit 9de416ac67b54d666327ba927a190f4b7259f4a0 ]

When enabled for both SCSI and NVME support, and connected pt2pt to a
SCSI only target, the driver nodelist entry for the remote port is left
in PRLI_ISSUE state and no SCSI LUNs are discovered. Works fine if only
configured for SCSI support.

Error was due to some of the prli points still reflecting the need to
send only 1 PRLI. On a lot of fabric configs, targets were NVME only,
which meant the fabric-reported protocol attributes were only telling
the driver one protocol or the other. Thus things worked fine. With
pt2pt, the driver must send a PRLI for both protocols as there are no
hints on what the target supports. Thus pt2pt targets were hitting the
multiple PRLI issues.

Complete the dual PRLI support. Track explicitly whether scsi (fcp) or
nvme prli's have been sent. Accurately track protocol support detected
on each node as reported by the fabric or probed by PRLI traffic.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 33417681f5d40784ffc15517f1ed137f2c6f23e3..126723a5bc6f607945e4b5cb252df3b0c9f9f39b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -471,6 +471,7 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type)
                                "Parse GID_FTrsp: did:x%x flg:x%x x%x",
                                Did, ndlp->nlp_flag, vport->fc_flag);
 
+                       ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME);
                        /* By default, the driver expects to support FCP FC4 */
                        if (fc4_type == FC_TYPE_FCP)
                                ndlp->nlp_fc4_type |= NLP_FC4_FCP;

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 3ebf6ccba6e63c588e7a6d2d771e158f85a3def1..91783dbdf10c5bfa6f19dec555fe22cac6c6b126 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -2088,6 +2088,10 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
        spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag &= ~NLP_PRLI_SND;
+
+       /* Driver supports multiple FC4 types.  Counters matter. */
+       vport->fc_prli_sent--;
+       ndlp->fc4_prli_sent--;
        spin_unlock_irq(shost->host_lock);
 
        lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
@@ -2095,9 +2099,6 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                irsp->ulpStatus, irsp->un.ulpWord[4],
                ndlp->nlp_DID);
 
-       /* Ddriver supports multiple FC4 types.  Counters matter. */
-       vport->fc_prli_sent--;
-
        /* PRLI completes to NPort <nlp_DID> */
        lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
                         "0103 PRLI completes to NPort x%06x "
@@ -2111,7 +2112,6 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
        if (irsp->ulpStatus) {
                /* Check for retry */
-               ndlp->fc4_prli_sent--;
                if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
                        /* ELS command is being retried */
                        goto out;
@@ -2190,6 +2190,15 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                ndlp->nlp_fc4_type |= NLP_FC4_NVME;
        local_nlp_type = ndlp->nlp_fc4_type;
 
+       /* This routine will issue 1 or 2 PRLIs, so zero all the ndlp
+        * fields here before any of them can complete.
+        */
+       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_flag &= ~NLP_FIRSTBURST;
+       ndlp->nvme_fb_size = 0;
+
  send_next_prli:
        if (local_nlp_type & NLP_FC4_FCP) {
                /* Payload is 4 + 16 = 20 x14 bytes. */
@@ -2298,6 +2307,13 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        elsiocb->iocb_cmpl = lpfc_cmpl_els_prli;
        spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_PRLI_SND;
+
+       /* The vport counters are used for lpfc_scan_finished, but
+        * the ndlp is used to track outstanding PRLIs for different
+        * FC4 types.
+        */
+       vport->fc_prli_sent++;
+       ndlp->fc4_prli_sent++;
        spin_unlock_irq(shost->host_lock);
        if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==
            IOCB_ERROR) {
@@ -2308,12 +2324,6 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                return 1;
        }
 
-       /* The vport counters are used for lpfc_scan_finished, but
-        * the ndlp is used to track outstanding PRLIs for different
-        * FC4 types.
-        */
-       vport->fc_prli_sent++;
-       ndlp->fc4_prli_sent++;
 
        /* The driver supports 2 FC4 types.  Make sure
         * a PRLI is issued for all types before exiting.

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index b6957d944b9ac4d361be53c7654e02bc082867d7..678bfdd53eb21bd9e0c2f602276747b159d9ca5d 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -390,6 +390,11 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                break;
        }
 
+       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_flag &= ~NLP_FIRSTBURST;
+
        /* Check for Nport to NPort pt2pt protocol */
        if ((vport->fc_flag & FC_PT2PT) &&
            !(vport->fc_flag & FC_PT2PT_PLOGI)) {
@@ -742,9 +747,6 @@ lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        lp = (uint32_t *) pcmd->virt;
        npr = (PRLI *) ((uint8_t *) lp + sizeof (uint32_t));
 
-       ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
-       ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
-       ndlp->nlp_flag &= ~NLP_FIRSTBURST;
        if ((npr->prliType == PRLI_FCP_TYPE) ||
            (npr->prliType == PRLI_NVME_TYPE)) {
                if (npr->initiatorFunc) {
@@ -769,8 +771,12 @@ lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 * type.  Target mode does not issue gft_id so doesn't get
                 * the fc4 type set until now.
                 */
-               if ((phba->nvmet_support) && (npr->prliType == PRLI_NVME_TYPE))
+               if (phba->nvmet_support && (npr->prliType == PRLI_NVME_TYPE)) {
                        ndlp->nlp_fc4_type |= NLP_FC4_NVME;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
+               }
+               if (npr->prliType == PRLI_FCP_TYPE)
+                       ndlp->nlp_fc4_type |= NLP_FC4_FCP;
        }
        if (rport) {
                /* We need to update the rport role values */
@@ -1552,7 +1558,6 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_vport *vport,
                if (ndlp->nlp_flag & NLP_RPI_REGISTERED) {
                        lpfc_rcv_prli(vport, ndlp, cmdiocb);
                        lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
-                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
                } else {
                        /* RPI registration has not completed. Reject the PRLI
                         * to prevent an illegal state transition when the
@@ -1568,6 +1573,7 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_vport *vport,
                        stat.un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS;
                        lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb,
                                            ndlp, NULL);
+                       return ndlp->nlp_state;
                }
        } else {
                /* Initiator mode. */
@@ -1922,13 +1928,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                return ndlp->nlp_state;
        }
 
-       /* Check out PRLI rsp */
-       ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
-       ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
-
-       /* NVME or FCP first burst must be negotiated for each PRLI. */
-       ndlp->nlp_flag &= ~NLP_FIRSTBURST;
-       ndlp->nvme_fb_size = 0;
        if (npr && (npr->acceptRspCode == PRLI_REQ_EXECUTED) &&
            (npr->prliType == PRLI_FCP_TYPE)) {
                lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
@@ -1945,8 +1944,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                if (npr->Retry)
                        ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE;
 
-               /* PRLI completed.  Decrement count. */
-               ndlp->fc4_prli_sent--;
        } else if (nvpr &&
                   (bf_get_be32(prli_acc_rsp_code, nvpr) ==
                    PRLI_REQ_EXECUTED) &&
@@ -1991,8 +1988,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                                 be32_to_cpu(nvpr->word5),
                                 ndlp->nlp_flag, ndlp->nlp_fcp_info,
                                 ndlp->nlp_type);
-               /* PRLI completed.  Decrement count. */
-               ndlp->fc4_prli_sent--;
        }
        if (!(ndlp->nlp_type & NLP_FCP_TARGET) &&
            (vport->port_type == LPFC_NPIV_PORT) &&
@@ -2016,7 +2011,8 @@ out_err:
                ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
                if (ndlp->nlp_type & (NLP_FCP_TARGET | NLP_NVME_TARGET))
                        lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE);
-               else
+               else if (ndlp->nlp_type &
+                        (NLP_FCP_INITIATOR | NLP_NVME_INITIATOR))
                        lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
        } else
                lpfc_printf_vlog(vport,