scsi: target: iscsit: Fix TAS handling during conn cleanup

Fix a bug added in commit f36199355c64 ("scsi: target: iscsi: Fix cmd abort
fabric stop race").

If CMD_T_TAS is set on the se_cmd we must call iscsit_free_cmd() to do the
last put on the cmd and free it, because the connection is down and we will
not up sending the response and doing the put from the normal I/O
path.

Add a check for CMD_T_TAS in iscsit_release_commands_from_conn() so we now
detect this case and run iscsit_free_cmd().

Fixes: f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop race")
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20230319015620.96006-9-michael.christie@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 26634dbea9b81f0e9b8def6b921675ab6180b39f..07e196b44b91dae44571b717ae3771682dd1e0fb 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4220,9 +4220,12 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)
        list_for_each_entry_safe(cmd, cmd_tmp, &tmp_list, i_conn_node) {
                struct se_cmd *se_cmd = &cmd->se_cmd;
 
-               if (se_cmd->se_tfo != NULL) {
-                       spin_lock_irq(&se_cmd->t_state_lock);
-                       if (se_cmd->transport_state & CMD_T_ABORTED) {
+               if (!se_cmd->se_tfo)
+                       continue;
+
+               spin_lock_irq(&se_cmd->t_state_lock);
+               if (se_cmd->transport_state & CMD_T_ABORTED) {
+                       if (!(se_cmd->transport_state & CMD_T_TAS))
                                /*
                                 * LIO's abort path owns the cleanup for this,
                                 * so put it back on the list and let
@@ -4230,11 +4233,10 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)
                                 */
                                list_move_tail(&cmd->i_conn_node,
                                               &conn->conn_cmd_list);
-                       } else {
-                               se_cmd->transport_state |= CMD_T_FABRIC_STOP;
-                       }
-                       spin_unlock_irq(&se_cmd->t_state_lock);
+               } else {
+                       se_cmd->transport_state |= CMD_T_FABRIC_STOP;
                }
+               spin_unlock_irq(&se_cmd->t_state_lock);
        }
        spin_unlock_bh(&conn->cmd_lock);