Skip to content

Commit 4e426ed

Browse files
Nicholas Bellingergregkh
authored andcommitted
target: Fix QUEUE_FULL + SCSI task attribute handling
commit 1c79df1f349fb6050016cea4ef1dfbc3853a5685 upstream. This patch fixes a bug during QUEUE_FULL where transport_complete_qf() calls transport_complete_task_attr() after it's already been invoked by target_complete_ok_work() or transport_generic_request_failure() during initial completion, preceeding QUEUE_FULL. This will result in se_device->simple_cmds, se_device->dev_cur_ordered_id and/or se_device->dev_ordered_sync being updated multiple times for a single se_cmd. To address this bug, clear SCF_TASK_ATTR_SET after the first call to transport_complete_task_attr(), and avoid updating SCSI task attribute related counters for any subsequent calls. Also, when a se_cmd is deferred due to ordered tags and executed via target_restart_delayed_cmds(), set CMD_T_SENT before execution matching what target_execute_cmd() does. Cc: Michael Cyr <mikecyr@linux.vnet.ibm.com> Cc: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Cc: Mike Christie <mchristi@redhat.com> Cc: Hannes Reinecke <hare@suse.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 63bfc4c commit 4e426ed

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/target/target_core_transport.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,6 +1970,8 @@ static void target_restart_delayed_cmds(struct se_device *dev)
19701970
list_del(&cmd->se_delayed_node);
19711971
spin_unlock(&dev->delayed_cmd_lock);
19721972

1973+
cmd->transport_state |= CMD_T_SENT;
1974+
19731975
__target_execute_cmd(cmd, true);
19741976

19751977
if (cmd->sam_task_attr == TCM_ORDERED_TAG)
@@ -2007,6 +2009,8 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
20072009
pr_debug("Incremented dev_cur_ordered_id: %u for ORDERED\n",
20082010
dev->dev_cur_ordered_id);
20092011
}
2012+
cmd->se_cmd_flags &= ~SCF_TASK_ATTR_SET;
2013+
20102014
restart:
20112015
target_restart_delayed_cmds(dev);
20122016
}

0 commit comments

Comments
 (0)