1 files changed, 32 insertions, 79 deletions

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index aaccc5f5fc9f..128ce46fa48a 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -73,9 +73,8 @@
 /*
  * struct se_device->dev_flags
  */
-#define DF_READ_ONLY                            0x00000001
-#define DF_SPC2_RESERVATIONS                    0x00000002
-#define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000004
+#define DF_SPC2_RESERVATIONS                    0x00000001
+#define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000002
 
 /* struct se_dev_attrib sanity values */
 /* Default max_unmap_lba_count */
@@ -141,25 +140,14 @@ enum transport_tpg_type_table {
         TRANSPORT_TPG_TYPE_DISCOVERY = 1,
 };
 
-/* struct se_task->task_flags */
-enum se_task_flags {
-        TF_ACTIVE               = (1 << 0),
-        TF_SENT                 = (1 << 1),
-        TF_REQUEST_STOP         = (1 << 2),
-        TF_HAS_SENSE            = (1 << 3),
-};
-
 /* Special transport agnostic struct se_cmd->t_states */
 enum transport_state_table {
         TRANSPORT_NO_STATE      = 0,
         TRANSPORT_NEW_CMD       = 1,
         TRANSPORT_WRITE_PENDING = 3,
-        TRANSPORT_PROCESS_WRITE = 4,
         TRANSPORT_PROCESSING    = 5,
         TRANSPORT_COMPLETE      = 6,
-        TRANSPORT_PROCESS_TMR   = 9,
         TRANSPORT_ISTATE_PROCESSING = 11,
-        TRANSPORT_NEW_CMD_MAP   = 16,
         TRANSPORT_COMPLETE_QF_WP = 18,
         TRANSPORT_COMPLETE_QF_OK = 19,
 };
@@ -169,25 +157,20 @@ enum se_cmd_flags_table {
         SCF_SUPPORTED_SAM_OPCODE        = 0x00000001,
         SCF_TRANSPORT_TASK_SENSE        = 0x00000002,
         SCF_EMULATED_TASK_SENSE         = 0x00000004,
-        SCF_SCSI_DATA_SG_IO_CDB         = 0x00000008,
-        SCF_SCSI_CONTROL_SG_IO_CDB      = 0x00000010,
-        SCF_SCSI_NON_DATA_CDB           = 0x00000020,
-        SCF_SCSI_TMR_CDB                = 0x00000040,
-        SCF_SCSI_CDB_EXCEPTION          = 0x00000080,
-        SCF_SCSI_RESERVATION_CONFLICT   = 0x00000100,
-        SCF_FUA                         = 0x00000200,
-        SCF_SE_LUN_CMD                  = 0x00000800,
-        SCF_SE_ALLOW_EOO                = 0x00001000,
-        SCF_BIDI                        = 0x00002000,
-        SCF_SENT_CHECK_CONDITION        = 0x00004000,
-        SCF_OVERFLOW_BIT                = 0x00008000,
-        SCF_UNDERFLOW_BIT               = 0x00010000,
-        SCF_SENT_DELAYED_TAS            = 0x00020000,
-        SCF_ALUA_NON_OPTIMIZED          = 0x00040000,
-        SCF_DELAYED_CMD_FROM_SAM_ATTR   = 0x00080000,
-        SCF_UNUSED                      = 0x00100000,
-        SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00200000,
-        SCF_ACK_KREF                    = 0x00400000,
+        SCF_SCSI_DATA_CDB               = 0x00000008,
+        SCF_SCSI_TMR_CDB                = 0x00000010,
+        SCF_SCSI_CDB_EXCEPTION          = 0x00000020,
+        SCF_SCSI_RESERVATION_CONFLICT   = 0x00000040,
+        SCF_FUA                         = 0x00000080,
+        SCF_SE_LUN_CMD                  = 0x00000100,
+        SCF_BIDI                        = 0x00000400,
+        SCF_SENT_CHECK_CONDITION        = 0x00000800,
+        SCF_OVERFLOW_BIT                = 0x00001000,
+        SCF_UNDERFLOW_BIT               = 0x00002000,
+        SCF_SENT_DELAYED_TAS            = 0x00004000,
+        SCF_ALUA_NON_OPTIMIZED          = 0x00008000,
+        SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00020000,
+        SCF_ACK_KREF                    = 0x00040000,
 };
 
 /* struct se_dev_entry->lun_flags and struct se_lun->lun_access */
@@ -229,11 +212,13 @@ enum tcm_sense_reason_table {
         TCM_CHECK_CONDITION_UNIT_ATTENTION      = 0x0e,
         TCM_CHECK_CONDITION_NOT_READY           = 0x0f,
         TCM_RESERVATION_CONFLICT                = 0x10,
+        TCM_ADDRESS_OUT_OF_RANGE                = 0x11,
 };
 
 enum target_sc_flags_table {
         TARGET_SCF_BIDI_OP              = 0x01,
         TARGET_SCF_ACK_KREF             = 0x02,
+        TARGET_SCF_UNKNOWN_SIZE         = 0x04,
 };
 
 /* fabric independent task management function values */
@@ -338,6 +323,7 @@ struct t10_alua_tg_pt_gp {
         int     tg_pt_gp_alua_access_type;
         int     tg_pt_gp_nonop_delay_msecs;
         int     tg_pt_gp_trans_delay_msecs;
+        int     tg_pt_gp_implict_trans_secs;
         int     tg_pt_gp_pref;
         int     tg_pt_gp_write_metadata;
         /* Used by struct t10_alua_tg_pt_gp->tg_pt_gp_md_buf_len */
@@ -478,30 +464,6 @@ struct t10_reservation {
         struct t10_reservation_ops pr_ops;
 };
 
-struct se_queue_obj {
-        atomic_t                queue_cnt;
-        spinlock_t              cmd_queue_lock;
-        struct list_head        qobj_list;
-        wait_queue_head_t       thread_wq;
-};
-
-struct se_task {
-        unsigned long long      task_lba;
-        u32                     task_sectors;
-        u32                     task_size;
-        struct se_cmd           *task_se_cmd;
-        struct scatterlist      *task_sg;
-        u32                     task_sg_nents;
-        u16                     task_flags;
-        u8                      task_scsi_status;
-        enum dma_data_direction task_data_direction;
-        struct list_head        t_list;
-        struct list_head        t_execute_list;
-        struct list_head        t_state_list;
-        bool                    t_state_active;
-        struct completion       task_stop_comp;
-};
-
 struct se_tmr_req {
         /* Task Management function to be performed */
         u8                      function;
@@ -510,11 +472,8 @@ struct se_tmr_req {
         int                     call_transport;
         /* Reference to ITT that Task Mgmt should be performed */
         u32                     ref_task_tag;
-        /* 64-bit encoded SAM LUN from $FABRIC_MOD TMR header */
-        u64                     ref_task_lun;
         void                    *fabric_tmr_ptr;
         struct se_cmd           *task_cmd;
-        struct se_cmd           *ref_cmd;
         struct se_device        *tmr_dev;
         struct se_lun           *tmr_lun;
         struct list_head        tmr_list;
@@ -538,6 +497,7 @@ struct se_cmd {
         /* Used to signal cmd->se_tfo->check_release_cmd() usage per cmd */
         unsigned                check_release:1;
         unsigned                cmd_wait_set:1;
+        unsigned                unknown_data_length:1;
         /* See se_cmd_flags_table */
         u32                     se_cmd_flags;
         u32                     se_ordered_id;
@@ -560,23 +520,17 @@ struct se_cmd {
         /* Only used for internal passthrough and legacy TCM fabric modules */
         struct se_session       *se_sess;
         struct se_tmr_req       *se_tmr_req;
-        struct list_head        se_queue_node;
         struct list_head        se_cmd_list;
         struct completion       cmd_wait_comp;
         struct kref             cmd_kref;
         struct target_core_fabric_ops *se_tfo;
-        int (*execute_task)(struct se_task *);
+        int (*execute_cmd)(struct se_cmd *);
         void (*transport_complete_callback)(struct se_cmd *);
 
         unsigned char           *t_task_cdb;
         unsigned char           __t_task_cdb[TCM_MAX_COMMAND_SIZE];
         unsigned long long      t_task_lba;
-        u32                     t_tasks_sg_chained_no;
         atomic_t                t_fe_count;
-        atomic_t                t_se_count;
-        atomic_t                t_task_cdbs_left;
-        atomic_t                t_task_cdbs_ex_left;
-        atomic_t                t_task_cdbs_sent;
         unsigned int            transport_state;
 #define CMD_T_ABORTED           (1 << 0)
 #define CMD_T_ACTIVE            (1 << 1)
@@ -588,11 +542,12 @@ struct se_cmd {
 #define CMD_T_LUN_STOP          (1 << 7)
 #define CMD_T_LUN_FE_STOP       (1 << 8)
 #define CMD_T_DEV_ACTIVE        (1 << 9)
+#define CMD_T_REQUEST_STOP      (1 << 10)
+#define CMD_T_BUSY              (1 << 11)
         spinlock_t              t_state_lock;
         struct completion       t_transport_stop_comp;
         struct completion       transport_lun_fe_stop_comp;
         struct completion       transport_lun_stop_comp;
-        struct scatterlist      *t_tasks_sg_chained;
 
         struct work_struct      work;
 
@@ -602,10 +557,14 @@ struct se_cmd {
         struct scatterlist      *t_bidi_data_sg;
         unsigned int            t_bidi_data_nents;
 
-        /* Used for BIDI READ */
-        struct list_head        t_task_list;
-        u32                     t_task_list_num;
+        struct list_head        state_list;
+        bool                    state_active;
+
+        /* old task stop completion, consider merging with some of the above */
+        struct completion       task_stop_comp;
 
+        /* backend private data */
+        void                    *priv;
 };
 
 struct se_ua {
@@ -655,7 +614,6 @@ struct se_session {
         struct list_head        sess_list;
         struct list_head        sess_acl_list;
         struct list_head        sess_cmd_list;
-        struct list_head        sess_wait_list;
         spinlock_t              sess_cmd_lock;
         struct kref             sess_kref;
 };
@@ -731,7 +689,6 @@ struct se_dev_attrib {
         u32             hw_block_size;
         u32             block_size;
         u32             hw_max_sectors;
-        u32             max_sectors;
         u32             fabric_max_sectors;
         u32             optimal_sectors;
         u32             hw_queue_depth;
@@ -803,13 +760,11 @@ struct se_device {
         /* Active commands on this virtual SE device */
         atomic_t                simple_cmds;
         atomic_t                dev_ordered_id;
-        atomic_t                execute_tasks;
         atomic_t                dev_ordered_sync;
         atomic_t                dev_qf_count;
         struct se_obj           dev_obj;
         struct se_obj           dev_access_obj;
         struct se_obj           dev_export_obj;
-        struct se_queue_obj     dev_queue_obj;
         spinlock_t              delayed_cmd_lock;
         spinlock_t              execute_task_lock;
         spinlock_t              dev_reservation_lock;
@@ -825,12 +780,10 @@ struct se_device {
         struct t10_pr_registration *dev_pr_res_holder;
         struct list_head        dev_sep_list;
         struct list_head        dev_tmr_list;
-        /* Pointer to descriptor for processing thread */
-        struct task_struct      *process_thread;
+        struct workqueue_struct *tmr_wq;
         struct work_struct      qf_work_queue;
         struct list_head        delayed_cmd_list;
-        struct list_head        execute_task_list;
-        struct list_head        state_task_list;
+        struct list_head        state_list;
         struct list_head        qf_cmd_list;
         /* Pointer to associated SE HBA */
         struct se_hba           *se_hba;