scsi: iscsi: Clean up bound endpoints during shutdown

In the next patch we allow drivers to drive session removal during
shutdown. In this case iscsid will not be running, so we need to detect
bound endpoints and disconnect them. This moves the bound ep check so we
now always check.

Link: https://lore.kernel.org/r/20220616222738.5722-4-michael.christie@oracle.com
Tested-by: Nilesh Javali <njavali@marvell.com>
Reviewed-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 237830fb4d545474cecc2dc1e2ab08b201289c56..c9de0acdccee298974a3dd25df0f85476c3c7588 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2260,6 +2260,16 @@ static void iscsi_if_disconnect_bound_ep(struct iscsi_cls_conn *conn,
 static int iscsi_if_stop_conn(struct iscsi_cls_conn *conn, int flag)
 {
        ISCSI_DBG_TRANS_CONN(conn, "iscsi if conn stop.\n");
+       /*
+        * For offload, iscsid may not know about the ep like when iscsid is
+        * restarted or for kernel based session shutdown iscsid is not even
+        * up. For these cases, we do the disconnect now.
+        */
+       mutex_lock(&conn->ep_mutex);
+       if (conn->ep)
+               iscsi_if_disconnect_bound_ep(conn, conn->ep, true);
+       mutex_unlock(&conn->ep_mutex);
+
        /*
         * If this is a termination we have to call stop_conn with that flag
         * so the correct states get set. If we haven't run the work yet try to
@@ -2269,16 +2279,6 @@ static int iscsi_if_stop_conn(struct iscsi_cls_conn *conn, int flag)
                cancel_work_sync(&conn->cleanup_work);
                iscsi_stop_conn(conn, flag);
        } else {
-               /*
-                * For offload, when iscsid is restarted it won't know about
-                * existing endpoints so it can't do a ep_disconnect. We clean
-                * it up here for userspace.
-                */
-               mutex_lock(&conn->ep_mutex);
-               if (conn->ep)
-                       iscsi_if_disconnect_bound_ep(conn, conn->ep, true);
-               mutex_unlock(&conn->ep_mutex);
-
                /*
                 * Figure out if it was the kernel or userspace initiating this.
                 */