scsi: lpfc: Correct used_rpi count when devloss tmo fires with no recovery

[ Upstream commit db651ec22524eb8f9c854fbb4d9acd5d7e5be9e4 ]

A fabric controller can sometimes send an RDP request right before a link
down event.  Because of this outstanding RDP request, the driver does not
remove the last reference count on its ndlp causing a potential leak of RPI
resources when devloss tmo fires.

In lpfc_cmpl_els_rsp(), modify the NPIV clause to always allow the
lpfc_drop_node() routine to execute when not registered with SCSI
transport.

This relaxes the contraint that an NPIV ndlp must be in a specific state in
order to call lpfc_drop node.  Logic is revised such that the
lpfc_drop_node() routine is always called to ensure the last ndlp decrement
occurs.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20230301231626.9621-7-justintee8345@gmail.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 863b2125fed6cebe9a0ffdade153914af88c8a26..ddd5949d8fc01d8ce9d420c98d4fe27da6e58c75 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -5402,18 +5402,20 @@ out:
         * these conditions and release the RPI.
         */
        if (phba->sli_rev == LPFC_SLI_REV4 &&
-           (vport && vport->port_type == LPFC_NPIV_PORT) &&
-           !(ndlp->fc4_xpt_flags & SCSI_XPT_REGD) &&
-           ndlp->nlp_flag & NLP_RELEASE_RPI) {
-               if (ndlp->nlp_state !=  NLP_STE_PLOGI_ISSUE &&
-                   ndlp->nlp_state != NLP_STE_REG_LOGIN_ISSUE) {
-                       lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);
-                       spin_lock_irq(&ndlp->lock);
-                       ndlp->nlp_rpi = LPFC_RPI_ALLOC_ERROR;
-                       ndlp->nlp_flag &= ~NLP_RELEASE_RPI;
-                       spin_unlock_irq(&ndlp->lock);
-                       lpfc_drop_node(vport, ndlp);
+           vport && vport->port_type == LPFC_NPIV_PORT &&
+           !(ndlp->fc4_xpt_flags & SCSI_XPT_REGD)) {
+               if (ndlp->nlp_flag & NLP_RELEASE_RPI) {
+                       if (ndlp->nlp_state != NLP_STE_PLOGI_ISSUE &&
+                           ndlp->nlp_state != NLP_STE_REG_LOGIN_ISSUE) {
+                               lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);
+                               spin_lock_irq(&ndlp->lock);
+                               ndlp->nlp_rpi = LPFC_RPI_ALLOC_ERROR;
+                               ndlp->nlp_flag &= ~NLP_RELEASE_RPI;
+                               spin_unlock_irq(&ndlp->lock);
+                       }
                }
+
+               lpfc_drop_node(vport, ndlp);
        }
 
        /* Release the originating I/O reference. */