scsi: target: tcmu: Add attributes enforce_pr_isids and force_pr_aptpl

tcmu has not set TRANSPORT_FLAG_PASSTHROUGH_PGR. Therefore the in-core pr
emulation is active by default, but there are some attributes for
configuration missing. Add them.

Link: https://lore.kernel.org/r/20200427150823.15350-3-bstroesser@ts.fujitsu.com
Reviewed-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index d8589bb39c534ef4ffa3e6f7208778b0c5e0fa81..efa92d83694621a314adbb778c4ded037bdf225d 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -1210,6 +1210,17 @@ struct configfs_attribute *passthrough_attrib_attrs[] = {
 };
 EXPORT_SYMBOL(passthrough_attrib_attrs);
 
+/*
+ * pr related dev_attrib attributes for devices passing through CDBs,
+ * but allowing in core pr emulation.
+ */
+struct configfs_attribute *passthrough_pr_attrib_attrs[] = {
+       &attr_enforce_pr_isids,
+       &attr_force_pr_aptpl,
+       NULL,
+};
+EXPORT_SYMBOL(passthrough_pr_attrib_attrs);
+
 TB_CIT_SETUP_DRV(dev_attrib, NULL, NULL);
 TB_CIT_SETUP_DRV(dev_action, NULL, NULL);
 

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 0b9dfa6b17bc70c3302c90776cd220d0bf85dc81..4b190d600d2f4e9a5e4bec7279675d5830a97f2b 100644 (file)
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -2752,12 +2752,12 @@ static int __init tcmu_module_init(void)
                goto out_unreg_device;
        }
 
-       for (i = 0; passthrough_attrib_attrs[i] != NULL; i++) {
+       for (i = 0; passthrough_attrib_attrs[i] != NULL; i++)
                len += sizeof(struct configfs_attribute *);
-       }
-       for (i = 0; tcmu_attrib_attrs[i] != NULL; i++) {
+       for (i = 0; passthrough_pr_attrib_attrs[i] != NULL; i++)
+               len += sizeof(struct configfs_attribute *);
+       for (i = 0; tcmu_attrib_attrs[i] != NULL; i++)
                len += sizeof(struct configfs_attribute *);
-       }
        len += sizeof(struct configfs_attribute *);
 
        tcmu_attrs = kzalloc(len, GFP_KERNEL);
@@ -2766,13 +2766,12 @@ static int __init tcmu_module_init(void)
                goto out_unreg_genl;
        }
 
-       for (i = 0; passthrough_attrib_attrs[i] != NULL; i++) {
+       for (i = 0; passthrough_attrib_attrs[i] != NULL; i++)
                tcmu_attrs[i] = passthrough_attrib_attrs[i];
-       }
-       for (k = 0; tcmu_attrib_attrs[k] != NULL; k++) {
-               tcmu_attrs[i] = tcmu_attrib_attrs[k];
-               i++;
-       }
+       for (k = 0; passthrough_pr_attrib_attrs[k] != NULL; k++)
+               tcmu_attrs[i++] = passthrough_pr_attrib_attrs[k];
+       for (k = 0; tcmu_attrib_attrs[k] != NULL; k++)
+               tcmu_attrs[i++] = tcmu_attrib_attrs[k];
        tcmu_ops.tb_dev_attrib_attrs = tcmu_attrs;
 
        ret = transport_backend_register(&tcmu_ops);

diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 1b752d8ea529caf52502f29039cb6f2744d7dcc9..8177667eba6d15e2e8d2b91d33249d4cbd2c0116 100644 (file)
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -94,6 +94,7 @@ int   transport_set_vpd_ident(struct t10_vpd *, unsigned char *);
 
 extern struct configfs_attribute *sbc_attrib_attrs[];
 extern struct configfs_attribute *passthrough_attrib_attrs[];
+extern struct configfs_attribute *passthrough_pr_attrib_attrs[];
 
 /* core helpers also used by command snooping in pscsi */
 void   *transport_kmap_data_sg(struct se_cmd *);