lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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>
This commit is contained in:
Mike Christie 2023-03-18 20:56:19 -05:00 committed by Greg Kroah-Hartman
parent 8e402d5198
commit a4245323d2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/target/iscsi/iscsi_target.c
View File

@ -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) { list_for_each_entry_safe(cmd, cmd_tmp, &tmp_list, i_conn_node) {
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
if (se_cmd->se_tfo != NULL) { if (!se_cmd->se_tfo)
spin_lock_irq(&se_cmd->t_state_lock); continue;
if (se_cmd->transport_state & CMD_T_ABORTED) {
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, * LIO's abort path owns the cleanup for this,
* so put it back on the list and let * so put it back on the list and let
@ -4094,11 +4097,10 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)
*/ */
list_move_tail(&cmd->i_conn_node, list_move_tail(&cmd->i_conn_node,
&conn->conn_cmd_list); &conn->conn_cmd_list);
} else { } else {
se_cmd->transport_state |= CMD_T_FABRIC_STOP; se_cmd->transport_state |= CMD_T_FABRIC_STOP;
}
spin_unlock_irq(&se_cmd->t_state_lock);
} }
spin_unlock_irq(&se_cmd->t_state_lock);
} }
spin_unlock_bh(&conn->cmd_lock); spin_unlock_bh(&conn->cmd_lock);