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

Pull SCSI target updates from Nicholas Bellinger:
 "Lots of activity in target land the last months.

  The highlights include:

   - Convert fabric drivers tree-wide to target_register_template() (hch
     + bart)

   - iser-target hardening fixes + v1.0 improvements (sagi)

   - Convert iscsi_thread_set usage to kthread.h + kill
     iscsi_target_tq.c (sagi + nab)

   - Add support for T10-PI WRITE_STRIP + READ_INSERT operation (mkp +
     sagi + nab)

   - DIF fixes for CONFIG_DEBUG_SG=y + UNMAP file emulation (akinobu +
     sagi + mkp)

   - Extended TCMU ABI v2 for future BIDI + DIF support (andy + ilias)

   - Fix COMPARE_AND_WRITE handling for NO_ALLLOC drivers (hch + nab)

  Thanks to everyone who contributed this round with new features,
  bug-reports, fixes, cleanups and improvements.

  Looking forward, it's currently shaping up to be a busy v4.2 as well"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (69 commits)
  target: Put TCMU under a new config option
  target: Version 2 of TCMU ABI
  target: fix tcm_mod_builder.py
  target/file: Fix UNMAP with DIF protection support
  target/file: Fix SG table for prot_buf initialization
  target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
  target: Make core_tmr_abort_task() skip TMFs
  target/sbc: Update sbc_dif_generate pr_debug output
  target/sbc: Make internal DIF emulation honor ->prot_checks
  target/sbc: Return INVALID_CDB_FIELD if DIF + sess_prot_type disabled
  target: Ensure sess_prot_type is saved across session restart
  target/rd: Don't pass incomplete scatterlist entries to sbc_dif_verify_*
  target: Remove the unused flag SCF_ACK_KREF
  target: Fix two sparse warnings
  target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
  target: simplify the target template registration API
  target: simplify target_xcopy_init_pt_lun
  target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
  target/rd: reduce code duplication in rd_execute_rw()
  tcm_loop: fixup tpgt string to integer conversion
  ...

3 files changed, 83 insertions, 94 deletions

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 57418258c101..fe8a8d157e22 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3065,7 +3065,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
 {
         struct qla_hw_data *ha = vha->hw;
         struct se_cmd *se_cmd;
-        struct target_core_fabric_ops *tfo;
+        const struct target_core_fabric_ops *tfo;
         struct qla_tgt_cmd *cmd;
 
         if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index ab4879e12ea7..68c2002e78bf 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -53,9 +53,8 @@
 static struct workqueue_struct *tcm_qla2xxx_free_wq;
 static struct workqueue_struct *tcm_qla2xxx_cmd_wq;
 
-/* Local pointer to allocated TCM configfs fabric module */
-static struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
-static struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
+static const struct target_core_fabric_ops tcm_qla2xxx_ops;
+static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops;
 
 /*
  * Parse WWN.
@@ -336,6 +335,14 @@ static int tcm_qla2xxx_check_demo_mode_login_only(struct se_portal_group *se_tpg
         return tpg->tpg_attrib.demo_mode_login_only;
 }
 
+static int tcm_qla2xxx_check_prot_fabric_only(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return tpg->tpg_attrib.fabric_prot_type;
+}
+
 static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
         struct se_portal_group *se_tpg)
 {
@@ -1082,8 +1089,53 @@ static ssize_t tcm_qla2xxx_tpg_store_enable(
 
 TF_TPG_BASE_ATTR(tcm_qla2xxx, enable, S_IRUGO | S_IWUSR);
 
+static ssize_t tcm_qla2xxx_tpg_show_dynamic_sessions(
+        struct se_portal_group *se_tpg,
+        char *page)
+{
+        return target_show_dynamic_sessions(se_tpg, page);
+}
+
+TF_TPG_BASE_ATTR_RO(tcm_qla2xxx, dynamic_sessions);
+
+static ssize_t tcm_qla2xxx_tpg_store_fabric_prot_type(
+        struct se_portal_group *se_tpg,
+        const char *page,
+        size_t count)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        unsigned long val;
+        int ret = kstrtoul(page, 0, &val);
+
+        if (ret) {
+                pr_err("kstrtoul() returned %d for fabric_prot_type\n", ret);
+                return ret;
+        }
+        if (val != 0 && val != 1 && val != 3) {
+                pr_err("Invalid qla2xxx fabric_prot_type: %lu\n", val);
+                return -EINVAL;
+        }
+        tpg->tpg_attrib.fabric_prot_type = val;
+
+        return count;
+}
+
+static ssize_t tcm_qla2xxx_tpg_show_fabric_prot_type(
+        struct se_portal_group *se_tpg,
+        char *page)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return sprintf(page, "%d\n", tpg->tpg_attrib.fabric_prot_type);
+}
+TF_TPG_BASE_ATTR(tcm_qla2xxx, fabric_prot_type, S_IRUGO | S_IWUSR);
+
 static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = {
         &tcm_qla2xxx_tpg_enable.attr,
+        &tcm_qla2xxx_tpg_dynamic_sessions.attr,
+        &tcm_qla2xxx_tpg_fabric_prot_type.attr,
         NULL,
 };
 
@@ -1124,7 +1176,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(
         tpg->tpg_attrib.cache_dynamic_acls = 1;
         tpg->tpg_attrib.demo_mode_login_only = 1;
 
-        ret = core_tpg_register(&tcm_qla2xxx_fabric_configfs->tf_ops, wwn,
+        ret = core_tpg_register(&tcm_qla2xxx_ops, wwn,
                                 &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0) {
                 kfree(tpg);
@@ -1244,7 +1296,7 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
         tpg->tpg_attrib.cache_dynamic_acls = 1;
         tpg->tpg_attrib.demo_mode_login_only = 1;
 
-        ret = core_tpg_register(&tcm_qla2xxx_npiv_fabric_configfs->tf_ops, wwn,
+        ret = core_tpg_register(&tcm_qla2xxx_npiv_ops, wwn,
                                 &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0) {
                 kfree(tpg);
@@ -1560,7 +1612,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
 
         se_sess = transport_init_session_tags(num_tags,
                                               sizeof(struct qla_tgt_cmd),
-                                              TARGET_PROT_NORMAL);
+                                              TARGET_PROT_ALL);
         if (IS_ERR(se_sess)) {
                 pr_err("Unable to initialize struct se_session\n");
                 return PTR_ERR(se_sess);
@@ -1934,7 +1986,9 @@ static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = {
         NULL,
 };
 
-static struct target_core_fabric_ops tcm_qla2xxx_ops = {
+static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
+        .module                         = THIS_MODULE,
+        .name                           = "qla2xxx",
         .get_fabric_name                = tcm_qla2xxx_get_fabric_name,
         .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
         .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
@@ -1949,6 +2003,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
                                         tcm_qla2xxx_check_demo_write_protect,
         .tpg_check_prod_mode_write_protect =
                                         tcm_qla2xxx_check_prod_write_protect,
+        .tpg_check_prot_fabric_only     = tcm_qla2xxx_check_prot_fabric_only,
         .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only,
         .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
         .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
@@ -1983,9 +2038,15 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .fabric_drop_np                 = NULL,
         .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
         .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+
+        .tfc_wwn_attrs                  = tcm_qla2xxx_wwn_attrs,
+        .tfc_tpg_base_attrs             = tcm_qla2xxx_tpg_attrs,
+        .tfc_tpg_attrib_attrs           = tcm_qla2xxx_tpg_attrib_attrs,
 };
 
-static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
+static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
+        .module                         = THIS_MODULE,
+        .name                           = "qla2xxx_npiv",
         .get_fabric_name                = tcm_qla2xxx_npiv_get_fabric_name,
         .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
         .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
@@ -2033,94 +2094,26 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .fabric_drop_np                 = NULL,
         .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
         .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+
+        .tfc_wwn_attrs                  = tcm_qla2xxx_wwn_attrs,
+        .tfc_tpg_base_attrs             = tcm_qla2xxx_npiv_tpg_attrs,
 };
 
 static int tcm_qla2xxx_register_configfs(void)
 {
-        struct target_fabric_configfs *fabric, *npiv_fabric;
         int ret;
 
         pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on "
             UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
             utsname()->machine);
-        /*
-         * Register the top level struct config_item_type with TCM core
-         */
-        fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx");
-        if (IS_ERR(fabric)) {
-                pr_err("target_fabric_configfs_init() failed\n");
-                return PTR_ERR(fabric);
-        }
-        /*
-         * Setup fabric->tf_ops from our local tcm_qla2xxx_ops
-         */
-        fabric->tf_ops = tcm_qla2xxx_ops;
-        /*
-         * Setup default attribute lists for various fabric->tf_cit_tmpl
-         */
-        fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs =
-                                                tcm_qla2xxx_tpg_attrib_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-        /*
-         * Register the fabric for use within TCM
-         */
-        ret = target_fabric_configfs_register(fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
+
+        ret = target_register_template(&tcm_qla2xxx_ops);
+        if (ret)
                 return ret;
-        }
-        /*
-         * Setup our local pointer to *fabric
-         */
-        tcm_qla2xxx_fabric_configfs = fabric;
-        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_fabric_configfs\n");
 
-        /*
-         * Register the top level struct config_item_type for NPIV with TCM core
-         */
-        npiv_fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx_npiv");
-        if (IS_ERR(npiv_fabric)) {
-                pr_err("target_fabric_configfs_init() failed\n");
-                ret = PTR_ERR(npiv_fabric);
-                goto out_fabric;
-        }
-        /*
-         * Setup fabric->tf_ops from our local tcm_qla2xxx_npiv_ops
-         */
-        npiv_fabric->tf_ops = tcm_qla2xxx_npiv_ops;
-        /*
-         * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
-         */
-        npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs =
-            tcm_qla2xxx_npiv_tpg_attrs;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-        /*
-         * Register the npiv_fabric for use within TCM
-         */
-        ret = target_fabric_configfs_register(npiv_fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
+        ret = target_register_template(&tcm_qla2xxx_npiv_ops);
+        if (ret)
                 goto out_fabric;
-        }
-        /*
-         * Setup our local pointer to *npiv_fabric
-         */
-        tcm_qla2xxx_npiv_fabric_configfs = npiv_fabric;
-        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_npiv_fabric_configfs\n");
 
         tcm_qla2xxx_free_wq = alloc_workqueue("tcm_qla2xxx_free",
                                                 WQ_MEM_RECLAIM, 0);
@@ -2140,9 +2133,9 @@ static int tcm_qla2xxx_register_configfs(void)
 out_free_wq:
         destroy_workqueue(tcm_qla2xxx_free_wq);
 out_fabric_npiv:
-        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
+        target_unregister_template(&tcm_qla2xxx_npiv_ops);
 out_fabric:
-        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
+        target_unregister_template(&tcm_qla2xxx_ops);
         return ret;
 }
 
@@ -2151,13 +2144,8 @@ static void tcm_qla2xxx_deregister_configfs(void)
         destroy_workqueue(tcm_qla2xxx_cmd_wq);
         destroy_workqueue(tcm_qla2xxx_free_wq);
 
-        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
-        tcm_qla2xxx_fabric_configfs = NULL;
-        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_fabric_configfs\n");
-
-        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
-        tcm_qla2xxx_npiv_fabric_configfs = NULL;
-        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_npiv_fabric_configfs\n");
+        target_unregister_template(&tcm_qla2xxx_ops);
+        target_unregister_template(&tcm_qla2xxx_npiv_ops);
 }
 
 static int __init tcm_qla2xxx_init(void)
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
index 10c002145648..23295115c9fc 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -33,6 +33,7 @@ struct tcm_qla2xxx_tpg_attrib {
         int demo_mode_write_protect;
         int prod_mode_write_protect;
         int demo_mode_login_only;
+        int fabric_prot_type;
 };
 
 struct tcm_qla2xxx_tpg {