scsi: target/core: Remove several state tests from the TMF code

Whether or not a session is being torn down does not affect whether or not
SCSI commands are in the task set. Hence remove the "tearing down" checks
from the TMF code. The TRANSPORT_ISTATE_PROCESSING check is left out
because it is now safe to wait for a command that is in that state. The
CMD_T_PRE_EXECUTE is left out because abort processing is postponed until
after commands have left the pre-execute state since the patch that makes
TMF processing synchronous.

See also commit 1c21a48055a6 ("target: Avoid early CMD_T_PRE_EXECUTE
failures during ABORT_TASK").

Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index ad0061e09d4cbe03000ddaacf05e852ff50621d8..df1ca827de683cc40a00e0089b155cbdfc148577 100644 (file)
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -114,21 +114,6 @@ static bool __target_check_io_state(struct se_cmd *se_cmd,
                spin_unlock(&se_cmd->t_state_lock);
                return false;
        }
-       if (se_cmd->transport_state & CMD_T_PRE_EXECUTE) {
-               if (se_cmd->scsi_status) {
-                       pr_debug("Attempted to abort io tag: %llu early failure"
-                                " status: 0x%02x\n", se_cmd->tag,
-                                se_cmd->scsi_status);
-                       spin_unlock(&se_cmd->t_state_lock);
-                       return false;
-               }
-       }
-       if (sess->sess_tearing_down) {
-               pr_debug("Attempted to abort io tag: %llu already shutdown,"
-                       " skipping\n", se_cmd->tag);
-               spin_unlock(&se_cmd->t_state_lock);
-               return false;
-       }
        se_cmd->transport_state |= CMD_T_ABORTED;
 
        if ((tmr_sess != se_cmd->se_sess) && tas)
@@ -239,16 +224,6 @@ static void core_tmr_drain_tmr_list(
                        spin_unlock(&sess->sess_cmd_lock);
                        continue;
                }
-               if (cmd->t_state == TRANSPORT_ISTATE_PROCESSING) {
-                       spin_unlock(&cmd->t_state_lock);
-                       spin_unlock(&sess->sess_cmd_lock);
-                       continue;
-               }
-               if (sess->sess_tearing_down) {
-                       spin_unlock(&cmd->t_state_lock);
-                       spin_unlock(&sess->sess_cmd_lock);
-                       continue;
-               }
                cmd->transport_state |= CMD_T_ABORTED;
                spin_unlock(&cmd->t_state_lock);
 

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ef9e75b359d47048ab0a5449c6f3b576b6b23215..b25d27e8ca200ecdcfe12cd8f2daf35b78e51a34 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2056,7 +2056,6 @@ void target_execute_cmd(struct se_cmd *cmd)
 
        spin_lock_irq(&cmd->t_state_lock);
        cmd->t_state = TRANSPORT_PROCESSING;
-       cmd->transport_state &= ~CMD_T_PRE_EXECUTE;
        cmd->transport_state |= CMD_T_ACTIVE | CMD_T_SENT;
        spin_unlock_irq(&cmd->t_state_lock);
 
@@ -2765,7 +2764,6 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref)
                ret = -ESHUTDOWN;
                goto out;
        }
-       se_cmd->transport_state |= CMD_T_PRE_EXECUTE;
        list_add_tail(&se_cmd->se_cmd_list, &se_sess->sess_cmd_list);
        percpu_ref_get(&se_sess->cmd_count);
 out:

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 69b7b955902cee810a50c15c9de7b08ddc7c0ca1..19a5bf4214fcbaa5f19e838255c0b04c50c82042 100644 (file)
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -502,7 +502,6 @@ struct se_cmd {
 #define CMD_T_STOP             (1 << 5)
 #define CMD_T_TAS              (1 << 10)
 #define CMD_T_FABRIC_STOP      (1 << 11)
-#define CMD_T_PRE_EXECUTE      (1 << 12)
        spinlock_t              t_state_lock;
        struct kref             cmd_kref;
        struct completion       t_transport_stop_comp;