On Tue, 2012-12-11 at 16:30 -0800, Andy Grover wrote:
> Thanks for reviews, looking a lot better.
>
Looks good. Applying to for-next, and will include in the for-3.8 PULL
request going out over the next days.
--nab
> ---- 8< ----
>
> Initiator access config could be easier. The way other storage vendors
> have addressed this is to support initiator groups: the admin adds
> initiator WWNs to the group, and then LUN permissions can be granted for
> the entire group at once.
>
> Instead of changing ktarget's configfs interface, this patch keeps
> the configfs interface per-initiator-wwn and just adds a 'tag' field
> for each. This should be enough for user tools like targetcli to group
> initiator ACLs and sync their configurations.
>
> acl_tag is not used internally, but needs to be kept in configfs so that
> all user tools can avoid dependencies on each other.
>
> Code tested to work, although userspace pieces still to be implemented.
>
> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
> ---
> drivers/target/iscsi/iscsi_target_configfs.c | 24 ++++++++++++++++++++++++
> drivers/target/target_core_tpg.c | 23 +++++++++++++++++++++++
> include/target/target_core_base.h | 2 ++
> include/target/target_core_fabric.h | 2 ++
> 4 files changed, 51 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
> index 542641c..5201d5e 100644
> --- a/drivers/target/iscsi/iscsi_target_configfs.c
> +++ b/drivers/target/iscsi/iscsi_target_configfs.c
> @@ -754,9 +754,33 @@ static ssize_t lio_target_nacl_store_cmdsn_depth(
>
> TF_NACL_BASE_ATTR(lio_target, cmdsn_depth, S_IRUGO | S_IWUSR);
>
> +static ssize_t lio_target_nacl_show_tag(
> + struct se_node_acl *se_nacl,
> + char *page)
> +{
> + return snprintf(page, PAGE_SIZE, "%s", se_nacl->acl_tag);
> +}
> +
> +static ssize_t lio_target_nacl_store_tag(
> + struct se_node_acl *se_nacl,
> + const char *page,
> + size_t count)
> +{
> + int ret;
> +
> + ret = core_tpg_set_initiator_node_tag(se_nacl->se_tpg, se_nacl, page);
> +
> + if (ret < 0)
> + return ret;
> + return count;
> +}
> +
> +TF_NACL_BASE_ATTR(lio_target, tag, S_IRUGO | S_IWUSR);
> +
> static struct configfs_attribute *lio_target_initiator_attrs[] = {
> &lio_target_nacl_info.attr,
> &lio_target_nacl_cmdsn_depth.attr,
> + &lio_target_nacl_tag.attr,
> NULL,
> };
>
> diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
> index 0163309..5192ac0 100644
> --- a/drivers/target/target_core_tpg.c
> +++ b/drivers/target/target_core_tpg.c
> @@ -616,6 +616,29 @@ int core_tpg_set_initiator_node_queue_depth(
> }
> EXPORT_SYMBOL(core_tpg_set_initiator_node_queue_depth);
>
> +/* core_tpg_set_initiator_node_tag():
> + *
> + * Initiator nodeacl tags are not used internally, but may be used by
> + * userspace to emulate aliases or groups.
> + * Returns length of newly-set tag or -EINVAL.
> + */
> +int core_tpg_set_initiator_node_tag(
> + struct se_portal_group *tpg,
> + struct se_node_acl *acl,
> + const char *new_tag)
> +{
> + if (strlen(new_tag) >= MAX_ACL_TAG_SIZE)
> + return -EINVAL;
> +
> + if (!strncmp("NULL", new_tag, 4)) {
> + acl->acl_tag[0] = '\0';
> + return 0;
> + }
> +
> + return snprintf(acl->acl_tag, MAX_ACL_TAG_SIZE, "%s", new_tag);
> +}
> +EXPORT_SYMBOL(core_tpg_set_initiator_node_tag);
> +
> static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
> {
> /* Set in core_dev_setup_virtual_lun0() */
> diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
> index 1346ee0..7cae236 100644
> --- a/include/target/target_core_base.h
> +++ b/include/target/target_core_base.h
> @@ -507,6 +507,8 @@ struct se_node_acl {
> bool acl_stop:1;
> u32 queue_depth;
> u32 acl_index;
> +#define MAX_ACL_TAG_SIZE 64
> + char acl_tag[MAX_ACL_TAG_SIZE];
> u64 num_cmds;
> u64 read_bytes;
> u64 write_bytes;
> diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
> index 9087b20..aaa1ee6 100644
> --- a/include/target/target_core_fabric.h
> +++ b/include/target/target_core_fabric.h
> @@ -142,6 +142,8 @@ int core_tpg_del_initiator_node_acl(struct se_portal_group *,
> struct se_node_acl *, int);
> int core_tpg_set_initiator_node_queue_depth(struct se_portal_group *,
> unsigned char *, u32, int);
> +int core_tpg_set_initiator_node_tag(struct se_portal_group *,
> + struct se_node_acl *, const char *);
> int core_tpg_register(struct target_core_fabric_ops *, struct se_wwn *,
> struct se_portal_group *, void *, int);
> int core_tpg_deregister(struct se_portal_group *);
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
