scsi: lpfc: Move NPIV's transport unregistration to after resource clean up

[ Upstream commit 4ddf01f2f1504fa08b766e8cfeec558e9f8eef6c ]

There are cases after NPIV deletion where the fabric switch still believes
the NPIV is logged into the fabric.  This occurs when a vport is
unregistered before the Remove All DA_ID CT and LOGO ELS are sent to the
fabric.

Currently fc_remove_host(), which calls dev_loss_tmo for all D_IDs including
the fabric D_ID, removes the last ndlp reference and frees the ndlp rport
object.  This sometimes causes the race condition where the final DA_ID and
LOGO are skipped from being sent to the fabric switch.

Fix by moving the fc_remove_host() and scsi_remove_host() calls after DA_ID
and LOGO are sent.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20240305200503.57317-3-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_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index da9a1f72d938323df16e720748eb4629ad63e19a..b1071226e27fb624832ab7c4c831e99407d589af 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -651,10 +651,6 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
        lpfc_free_sysfs_attr(vport);
        lpfc_debugfs_terminate(vport);
 
-       /* Remove FC host to break driver binding. */
-       fc_remove_host(shost);
-       scsi_remove_host(shost);
-
        /* Send the DA_ID and Fabric LOGO to cleanup Nameserver entries. */
        ndlp = lpfc_findnode_did(vport, Fabric_DID);
        if (!ndlp)
@@ -700,6 +696,10 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
 
 skip_logo:
 
+       /* Remove FC host to break driver binding. */
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
+
        lpfc_cleanup(vport);
 
        /* Remove scsi host now.  The nodes are cleaned up. */