Commit 945a1607 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: target: Fix ordered CMD_T_SENT handling 

We can race where target_handle_task_attr() has put the cmd on the
delayed_cmd_list. Then target_restart_delayed_cmds() has removed it and set
CMD_T_SENT, but then target_execute_cmd() now clears that bit.

This patch moves the clearing to before we've put the cmd on the list.

Link: https://lore.kernel.org/r/20210930020422.92578-2-michael.christie@oracle.com


Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 25d542a8

drivers/target/target_core_transport.c

+5 −5
Original line number Diff line number Diff line
@@ -2200,6 +2200,10 @@ static bool target_handle_task_attr(struct se_cmd *cmd) 
	if (atomic_read(&dev->dev_ordered_sync) == 0)

		return false;



	spin_lock_irq(&cmd->t_state_lock);

	cmd->transport_state &= ~CMD_T_SENT;

	spin_unlock_irq(&cmd->t_state_lock);



	spin_lock(&dev->delayed_cmd_lock);

	list_add_tail(&cmd->se_delayed_node, &dev->delayed_cmd_list);

	spin_unlock(&dev->delayed_cmd_lock);
@@ -2228,12 +2232,8 @@ void target_execute_cmd(struct se_cmd *cmd) 
	if (target_write_prot_action(cmd))

		return;



	if (target_handle_task_attr(cmd)) {

		spin_lock_irq(&cmd->t_state_lock);

		cmd->transport_state &= ~CMD_T_SENT;

		spin_unlock_irq(&cmd->t_state_lock);

	if (target_handle_task_attr(cmd))

		return;

	}



	__target_execute_cmd(cmd, true);

}