target: kill dev->dev_task_attr_type

We can just key off ordered tag emulation of the transport_type field.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

3 files changed, 69 insertions, 72 deletions

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index e45a70970548..6a27e7fd33fb 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -1412,11 +1412,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
         dev->dev_attrib.fabric_max_sectors = DA_FABRIC_MAX_SECTORS;
         dev->dev_attrib.optimal_sectors = DA_FABRIC_MAX_SECTORS;
 
-        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
-                dev->dev_task_attr_type = SAM_TASK_ATTR_PASSTHROUGH;
-        else
-                dev->dev_task_attr_type = SAM_TASK_ATTR_EMULATED;
-
         return dev;
 }
 
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 1f1ddb8183c7..8ca62631ec7f 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -1054,8 +1054,7 @@ int spc_parse_cdb(struct se_cmd *cmd, unsigned int *size)
                  * Do implict HEAD_OF_QUEUE processing for INQUIRY.
                  * See spc4r17 section 5.3
                  */
-                if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
-                        cmd->sam_task_attr = MSG_HEAD_TAG;
+                cmd->sam_task_attr = MSG_HEAD_TAG;
                 cmd->execute_cmd = spc_emulate_inquiry;
                 break;
         case SECURITY_PROTOCOL_IN:
@@ -1083,8 +1082,7 @@ int spc_parse_cdb(struct se_cmd *cmd, unsigned int *size)
                  * Do implict HEAD_OF_QUEUE processing for REPORT_LUNS
                  * See spc4r17 section 5.3
                  */
-                if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
-                        cmd->sam_task_attr = MSG_HEAD_TAG;
+                cmd->sam_task_attr = MSG_HEAD_TAG;
                 break;
         case TEST_UNIT_READY:
                 cmd->execute_cmd = spc_emulate_testunitready;
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index c80d88435f90..757e3777ce79 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1068,11 +1068,13 @@ EXPORT_SYMBOL(transport_init_se_cmd);
 
 static int transport_check_alloc_task_attr(struct se_cmd *cmd)
 {
+        struct se_device *dev = cmd->se_dev;
+
         /*
          * Check if SAM Task Attribute emulation is enabled for this
          * struct se_device storage object
          */
-        if (cmd->se_dev->dev_task_attr_type != SAM_TASK_ATTR_EMULATED)
+        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
                 return 0;
 
         if (cmd->sam_task_attr == MSG_ACA_TAG) {
@@ -1084,11 +1086,11 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
          * Used to determine when ORDERED commands should go from
          * Dormant to Active status.
          */
-        cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
+        cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
         smp_mb__after_atomic_inc();
         pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
                         cmd->se_ordered_id, cmd->sam_task_attr,
-                        cmd->se_dev->transport->name);
+                        dev->transport->name);
         return 0;
 }
 
@@ -1534,8 +1536,7 @@ void transport_generic_request_failure(struct se_cmd *cmd)
         /*
          * For SAM Task Attribute emulation for failed struct se_cmd
          */
-        if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
-                transport_complete_task_attr(cmd);
+        transport_complete_task_attr(cmd);
 
         switch (cmd->scsi_sense_reason) {
         case TCM_NON_EXISTENT_LUN:
@@ -1619,49 +1620,12 @@ static void __target_execute_cmd(struct se_cmd *cmd)
         }
 }
 
-void target_execute_cmd(struct se_cmd *cmd)
+static bool target_handle_task_attr(struct se_cmd *cmd)
 {
         struct se_device *dev = cmd->se_dev;
 
-        /*
-         * If the received CDB has aleady been aborted stop processing it here.
-         */
-        if (transport_check_aborted_status(cmd, 1))
-                return;
-
-        /*
-         * Determine if IOCTL context caller in requesting the stopping of this
-         * command for LUN shutdown purposes.
-         */
-        spin_lock_irq(&cmd->t_state_lock);
-        if (cmd->transport_state & CMD_T_LUN_STOP) {
-                pr_debug("%s:%d CMD_T_LUN_STOP for ITT: 0x%08x\n",
-                        __func__, __LINE__, cmd->se_tfo->get_task_tag(cmd));
-
-                cmd->transport_state &= ~CMD_T_ACTIVE;
-                spin_unlock_irq(&cmd->t_state_lock);
-                complete(&cmd->transport_lun_stop_comp);
-                return;
-        }
-        /*
-         * Determine if frontend context caller is requesting the stopping of
-         * this command for frontend exceptions.
-         */
-        if (cmd->transport_state & CMD_T_STOP) {
-                pr_debug("%s:%d CMD_T_STOP for ITT: 0x%08x\n",
-                        __func__, __LINE__,
-                        cmd->se_tfo->get_task_tag(cmd));
-
-                spin_unlock_irq(&cmd->t_state_lock);
-                complete(&cmd->t_transport_stop_comp);
-                return;
-        }
-
-        cmd->t_state = TRANSPORT_PROCESSING;
-        spin_unlock_irq(&cmd->t_state_lock);
-
-        if (dev->dev_task_attr_type != SAM_TASK_ATTR_EMULATED)
-                goto execute;
+        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
+                return false;
 
         /*
          * Check for the existence of HEAD_OF_QUEUE, and if true return 1
@@ -1672,7 +1636,7 @@ void target_execute_cmd(struct se_cmd *cmd)
                 pr_debug("Added HEAD_OF_QUEUE for CDB: 0x%02x, "
                          "se_ordered_id: %u\n",
                          cmd->t_task_cdb[0], cmd->se_ordered_id);
-                goto execute;
+                return false;
         case MSG_ORDERED_TAG:
                 atomic_inc(&dev->dev_ordered_sync);
                 smp_mb__after_atomic_inc();
@@ -1686,7 +1650,7 @@ void target_execute_cmd(struct se_cmd *cmd)
                  * exist that need to be completed first.
                  */
                 if (!atomic_read(&dev->simple_cmds))
-                        goto execute;
+                        return false;
                 break;
         default:
                 /*
@@ -1697,23 +1661,61 @@ void target_execute_cmd(struct se_cmd *cmd)
                 break;
         }
 
-        if (atomic_read(&dev->dev_ordered_sync) != 0) {
-                spin_lock(&dev->delayed_cmd_lock);
-                list_add_tail(&cmd->se_delayed_node, &dev->delayed_cmd_list);
-                spin_unlock(&dev->delayed_cmd_lock);
+        if (atomic_read(&dev->dev_ordered_sync) == 0)
+                return false;
 
-                pr_debug("Added CDB: 0x%02x Task Attr: 0x%02x to"
-                        " delayed CMD list, se_ordered_id: %u\n",
-                        cmd->t_task_cdb[0], cmd->sam_task_attr,
-                        cmd->se_ordered_id);
+        spin_lock(&dev->delayed_cmd_lock);
+        list_add_tail(&cmd->se_delayed_node, &dev->delayed_cmd_list);
+        spin_unlock(&dev->delayed_cmd_lock);
+
+        pr_debug("Added CDB: 0x%02x Task Attr: 0x%02x to"
+                " delayed CMD list, se_ordered_id: %u\n",
+                cmd->t_task_cdb[0], cmd->sam_task_attr,
+                cmd->se_ordered_id);
+        return true;
+}
+
+void target_execute_cmd(struct se_cmd *cmd)
+{
+        /*
+         * If the received CDB has aleady been aborted stop processing it here.
+         */
+        if (transport_check_aborted_status(cmd, 1))
                 return;
-        }
 
-execute:
         /*
-         * Otherwise, no ORDERED task attributes exist..
+         * Determine if IOCTL context caller in requesting the stopping of this
+         * command for LUN shutdown purposes.
          */
-        __target_execute_cmd(cmd);
+        spin_lock_irq(&cmd->t_state_lock);
+        if (cmd->transport_state & CMD_T_LUN_STOP) {
+                pr_debug("%s:%d CMD_T_LUN_STOP for ITT: 0x%08x\n",
+                        __func__, __LINE__, cmd->se_tfo->get_task_tag(cmd));
+
+                cmd->transport_state &= ~CMD_T_ACTIVE;
+                spin_unlock_irq(&cmd->t_state_lock);
+                complete(&cmd->transport_lun_stop_comp);
+                return;
+        }
+        /*
+         * Determine if frontend context caller is requesting the stopping of
+         * this command for frontend exceptions.
+         */
+        if (cmd->transport_state & CMD_T_STOP) {
+                pr_debug("%s:%d CMD_T_STOP for ITT: 0x%08x\n",
+                        __func__, __LINE__,
+                        cmd->se_tfo->get_task_tag(cmd));
+
+                spin_unlock_irq(&cmd->t_state_lock);
+                complete(&cmd->t_transport_stop_comp);
+                return;
+        }
+
+        cmd->t_state = TRANSPORT_PROCESSING;
+        spin_unlock_irq(&cmd->t_state_lock);
+
+        if (!target_handle_task_attr(cmd))
+                __target_execute_cmd(cmd);
 }
 EXPORT_SYMBOL(target_execute_cmd);
 
@@ -1752,6 +1754,9 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
 {
         struct se_device *dev = cmd->se_dev;
 
+        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
+                return;
+
         if (cmd->sam_task_attr == MSG_SIMPLE_TAG) {
                 atomic_dec(&dev->simple_cmds);
                 smp_mb__after_atomic_dec();
@@ -1780,8 +1785,7 @@ static void transport_complete_qf(struct se_cmd *cmd)
 {
         int ret = 0;
 
-        if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
-                transport_complete_task_attr(cmd);
+        transport_complete_task_attr(cmd);
 
         if (cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE) {
                 ret = cmd->se_tfo->queue_status(cmd);
@@ -1839,8 +1843,8 @@ static void target_complete_ok_work(struct work_struct *work)
          * delayed execution list after a HEAD_OF_QUEUE or ORDERED Task
          * Attribute.
          */
-        if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
-                transport_complete_task_attr(cmd);
+        transport_complete_task_attr(cmd);
+
         /*
          * Check to schedule QUEUE_FULL work, or execute an existing
          * cmd->transport_qf_callback()