Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: use ->exectute_task for all CDB emulation
  target: remove SCF_EMULATE_CDB_ASYNC
  target: refactor transport_emulate_control_cdb
  target: pass the se_task to the CDB emulation callback
  target: split core_scsi3_emulate_pr
  target: split core_scsi2_emulate_crh
  target: Add generic active I/O shutdown logic
  target: add back error handling in transport_complete_task
  target/pscsi: blk_make_request() returns an ERR_PTR()
  target: Remove core TRANSPORT_FREE_CMD_INTR usage
  target: Make TFO->check_stop_free return free status
  iscsi-target: Fix non-immediate TMR handling
  iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd
  target: Avoid double list_del for aborted se_tmr_req
  target: Minor cleanups to core_tmr_drain_tmr_list
  target: Fix wrong se_tmr being added to drain_tmr_list
  target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list
  target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks
  tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB
  target: Fix compile warning w/ missing module.h include

4 files changed, 25 insertions, 8 deletions

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 35aa786f93da..7f5fed3c89e1 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -89,7 +89,6 @@ enum transport_state_table {
         TRANSPORT_PROCESS_TMR   = 9,
         TRANSPORT_ISTATE_PROCESSING = 11,
         TRANSPORT_NEW_CMD_MAP   = 16,
-        TRANSPORT_FREE_CMD_INTR = 17,
         TRANSPORT_COMPLETE_QF_WP = 18,
         TRANSPORT_COMPLETE_QF_OK = 19,
 };
@@ -115,7 +114,6 @@ enum se_cmd_flags_table {
         SCF_DELAYED_CMD_FROM_SAM_ATTR   = 0x00080000,
         SCF_UNUSED                      = 0x00100000,
         SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00400000,
-        SCF_EMULATE_CDB_ASYNC           = 0x01000000,
 };
 
 /* struct se_dev_entry->lun_flags and struct se_lun->lun_access */
@@ -426,6 +424,9 @@ struct se_cmd {
         enum transport_state_table t_state;
         /* Transport specific error status */
         int                     transport_error_status;
+        /* Used to signal cmd->se_tfo->check_release_cmd() usage per cmd */
+        int                     check_release:1;
+        int                     cmd_wait_set:1;
         /* See se_cmd_flags_table */
         u32                     se_cmd_flags;
         u32                     se_ordered_id;
@@ -452,8 +453,10 @@ struct se_cmd {
         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 target_core_fabric_ops *se_tfo;
-        int (*transport_emulate_cdb)(struct se_cmd *);
+        int (*execute_task)(struct se_task *);
         void (*transport_complete_callback)(struct se_cmd *);
 
         unsigned char           *t_task_cdb;
@@ -559,12 +562,16 @@ struct se_node_acl {
 } ____cacheline_aligned;
 
 struct se_session {
+        int                     sess_tearing_down:1;
         u64                     sess_bin_isid;
         struct se_node_acl      *se_node_acl;
         struct se_portal_group *se_tpg;
         void                    *fabric_sess_ptr;
         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;
 } ____cacheline_aligned;
 
 struct se_device;
diff --git a/include/target/target_core_device.h b/include/target/target_core_device.h
index 46571912086c..2be31ff8763b 100644
--- a/include/target/target_core_device.h
+++ b/include/target/target_core_device.h
@@ -17,7 +17,7 @@ extern int core_dev_export(struct se_device *, struct se_portal_group *,
                                         struct se_lun *);
 extern void core_dev_unexport(struct se_device *, struct se_portal_group *,
                                         struct se_lun *);
-extern int transport_core_report_lun_response(struct se_cmd *);
+extern int target_report_luns(struct se_task *);
 extern void se_release_device_for_hba(struct se_device *);
 extern void se_release_vpd_for_dev(struct se_device *);
 extern void se_clear_dev_ports(struct se_device *);
diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h
index 126c675f4f14..0256825f923d 100644
--- a/include/target/target_core_fabric_ops.h
+++ b/include/target/target_core_fabric_ops.h
@@ -46,9 +46,16 @@ struct target_core_fabric_ops {
         int (*new_cmd_map)(struct se_cmd *);
         /*
          * Optional to release struct se_cmd and fabric dependent allocated
-         * I/O descriptor in transport_cmd_check_stop()
+         * I/O descriptor in transport_cmd_check_stop().
+         *
+         * Returning 1 will signal a descriptor has been released.
+         * Returning 0 will signal a descriptor has not been released.
          */
-        void (*check_stop_free)(struct se_cmd *);
+        int (*check_stop_free)(struct se_cmd *);
+        /*
+         * Optional check for active I/O shutdown
+         */
+        int (*check_release_cmd)(struct se_cmd *);
         void (*release_cmd)(struct se_cmd *);
         /*
          * Called with spin_lock_bh(struct se_portal_group->session_lock held.
diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h
index a037a1a6fbba..c16e9431dd01 100644
--- a/include/target/target_core_transport.h
+++ b/include/target/target_core_transport.h
@@ -160,17 +160,20 @@ extern int transport_generic_handle_cdb_map(struct se_cmd *);
 extern int transport_generic_handle_data(struct se_cmd *);
 extern void transport_new_cmd_failure(struct se_cmd *);
 extern int transport_generic_handle_tmr(struct se_cmd *);
-extern void transport_generic_free_cmd_intr(struct se_cmd *);
 extern bool target_stop_task(struct se_task *task, unsigned long *flags);
 extern int transport_generic_map_mem_to_cmd(struct se_cmd *cmd, struct scatterlist *, u32,
                                 struct scatterlist *, u32);
 extern int transport_clear_lun_from_sessions(struct se_lun *);
-extern void transport_wait_for_tasks(struct se_cmd *);
+extern bool transport_wait_for_tasks(struct se_cmd *);
 extern int transport_check_aborted_status(struct se_cmd *, int);
 extern int transport_send_check_condition_and_sense(struct se_cmd *, u8, int);
 extern void transport_send_task_abort(struct se_cmd *);
 extern void transport_release_cmd(struct se_cmd *);
 extern void transport_generic_free_cmd(struct se_cmd *, int);
+extern void target_get_sess_cmd(struct se_session *, struct se_cmd *);
+extern int target_put_sess_cmd(struct se_session *, struct se_cmd *);
+extern void target_splice_sess_cmd_list(struct se_session *);
+extern void target_wait_for_sess_cmds(struct se_session *, int);
 extern void transport_generic_wait_for_cmds(struct se_cmd *, int);
 extern void transport_do_task_sg_chain(struct se_cmd *);
 extern void transport_generic_process_write(struct se_cmd *);