On 9/29/21 7:04 PM, Mike Christie wrote:
> 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.
>
> Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
> ---
> drivers/target/target_core_transport.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
> index 14c6f2bb1b01..e02173a4b7bc 100644
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@ -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);
> }
>
Reviewed-by: Lee Duncan <lduncan@xxxxxxxx>
