Commit a4245323 authored Mar 18, 2023 by Mike Christie Committed by Greg Kroah-Hartman May 17, 2023

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



[ Upstream commit cc79da306ebb2edb700c3816b90219223182ac3c ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8e402d51

drivers/target/iscsi/iscsi_target.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -4084,9 +4084,12 @@ static void iscsit_release_commands_from_conn(struct iscsi_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) {
		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
		@@ -4099,7 +4102,6 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)
		}
		spin_unlock_irq(&se_cmd->t_state_lock);
		}
		}
		spin_unlock_bh(&conn->cmd_lock);

		list_for_each_entry_safe(cmd, cmd_tmp, &tmp_list, i_conn_node) {