]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
authorJustin Tee <justin.tee@broadcom.com>
Tue, 5 Mar 2024 20:04:53 +0000 (12:04 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 May 2024 10:14:36 +0000 (12:14 +0200)
[ 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>
drivers/scsi/lpfc/lpfc_vport.c

index 6c7559cf1a4b65e7f3ba2ac23d78a13c0c0ac7eb..9e0e9e02d2c473cd6a0204491e1a8d06db96e1c0 100644 (file)
@@ -683,10 +683,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)
@@ -730,6 +726,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. */