From: Mike Christie <mchristi@redhat.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <mchristi@redhat.com>, "Michael S . Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Juergen Gross <jgross@suse.com> Subject: [PATCH 03/15] target: add helper to parse acl and transport name Date: Sun, 10 May 2020 21:57:32 +0000 [thread overview] Message-ID: <20200510215744.21999-4-mchristi@redhat.com> (raw) In-Reply-To: <20200510215744.21999-1-mchristi@redhat.com> The drivers that emulate the initiator port id (loop, scsi vhost, xen scsiback) do almost the extact same parsing when making their I_T_nexus. This adds a helper that parses out the acl name and port name from the user buffer, so these types of drivers drop prefixes like "naa." when they need to for the SCSI SPC4 TransportID SAS address, but then keep it for the LIO ACL name. The next patches will then convert those drivers. Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Juergen Gross <jgross@suse.com> Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/target_core_fabric_lib.c | 73 +++++++++++++++++++++++++++++++++ include/target/target_core_fabric.h | 2 + 2 files changed, 75 insertions(+) diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c index e89b3d8..81ed7d5 100644 --- a/drivers/target/target_core_fabric_lib.c +++ b/drivers/target/target_core_fabric_lib.c @@ -423,6 +423,79 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg, return buf + offset; } +/** + * target_parse_emulated_name - parse TransportID and acl name from user buffer + * @proto_id: SCSI protocol identifier + * @user_buf: buffer with emualted name to extract acl and TransportID from + * @acl_name: buffer to store se_node_acl name in + * @max_name_len: len of acl_name buffer + * @tpt_id_name: Pointer to the TransportID name will be stored here. + */ +int target_parse_emulated_name(u8 proto_id, const char *user_buf, + unsigned char *acl_name, int max_name_len, + unsigned char **tpt_id_name) +{ + int user_len = strlen(user_buf); + char *proto_prefix, *name_start; + + if (user_len >= max_name_len) { + pr_err("Emulated name: %s, exceeds max: %d\n", user_buf, + max_name_len); + return -EINVAL; + } + + switch (proto_id) { + case SCSI_PROTOCOL_SAS: + proto_prefix = "naa."; + break; + case SCSI_PROTOCOL_FCP: + proto_prefix = "fc."; + break; + case SCSI_PROTOCOL_ISCSI: + proto_prefix = "iqn."; + break; + default: + pr_err("Unsupported proto_id: 0x%02x\n", proto_id); + return -EINVAL; + } + + name_start = strstr(user_buf, proto_prefix); + if (!name_start) { + pr_err("Invalid emulated name %s. Must start with %s\n", + user_buf, proto_prefix); + return -EINVAL; + } + + switch (proto_id) { + case SCSI_PROTOCOL_SAS: + sprintf(acl_name, name_start); + break; + case SCSI_PROTOCOL_FCP: + sprintf(acl_name, &name_start[3]); /* Skip over "fc." */ + break; + case SCSI_PROTOCOL_ISCSI: + sprintf(acl_name, name_start); + break; + } + + if (acl_name[user_len - 1] = '\n') + acl_name[user_len - 1] = '\0'; + + if (proto_id = SCSI_PROTOCOL_SAS) { + /* + * target_setup_session will want the naa. prefix to match + * the ACL name, but the t10 transport id only wants the + * address. + */ + *tpt_id_name = acl_name + 4; + } else { + *tpt_id_name = acl_name; + } + + return 0; +} +EXPORT_SYMBOL(target_parse_emulated_name); + struct t10_transport_id *target_create_transport_id(u8 proto, const char *name, const char *session_id) { diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index af1dd81..0113e1c 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h @@ -125,6 +125,8 @@ struct target_core_fabric_ops { int target_depend_item(struct config_item *item); void target_undepend_item(struct config_item *item); +int target_parse_emulated_name(u8, const char *, unsigned char *, int, + unsigned char **); struct t10_transport_id *target_create_transport_id(u8, const char *, const char *); void target_free_transport_id(struct t10_transport_id *); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <mchristi@redhat.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <mchristi@redhat.com>, "Michael S . Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Juergen Gross <jgross@suse.com> Subject: [PATCH 03/15] target: add helper to parse acl and transport name Date: Sun, 10 May 2020 16:57:32 -0500 [thread overview] Message-ID: <20200510215744.21999-4-mchristi@redhat.com> (raw) In-Reply-To: <20200510215744.21999-1-mchristi@redhat.com> The drivers that emulate the initiator port id (loop, scsi vhost, xen scsiback) do almost the extact same parsing when making their I_T_nexus. This adds a helper that parses out the acl name and port name from the user buffer, so these types of drivers drop prefixes like "naa." when they need to for the SCSI SPC4 TransportID SAS address, but then keep it for the LIO ACL name. The next patches will then convert those drivers. Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Juergen Gross <jgross@suse.com> Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/target_core_fabric_lib.c | 73 +++++++++++++++++++++++++++++++++ include/target/target_core_fabric.h | 2 + 2 files changed, 75 insertions(+) diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c index e89b3d8..81ed7d5 100644 --- a/drivers/target/target_core_fabric_lib.c +++ b/drivers/target/target_core_fabric_lib.c @@ -423,6 +423,79 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg, return buf + offset; } +/** + * target_parse_emulated_name - parse TransportID and acl name from user buffer + * @proto_id: SCSI protocol identifier + * @user_buf: buffer with emualted name to extract acl and TransportID from + * @acl_name: buffer to store se_node_acl name in + * @max_name_len: len of acl_name buffer + * @tpt_id_name: Pointer to the TransportID name will be stored here. + */ +int target_parse_emulated_name(u8 proto_id, const char *user_buf, + unsigned char *acl_name, int max_name_len, + unsigned char **tpt_id_name) +{ + int user_len = strlen(user_buf); + char *proto_prefix, *name_start; + + if (user_len >= max_name_len) { + pr_err("Emulated name: %s, exceeds max: %d\n", user_buf, + max_name_len); + return -EINVAL; + } + + switch (proto_id) { + case SCSI_PROTOCOL_SAS: + proto_prefix = "naa."; + break; + case SCSI_PROTOCOL_FCP: + proto_prefix = "fc."; + break; + case SCSI_PROTOCOL_ISCSI: + proto_prefix = "iqn."; + break; + default: + pr_err("Unsupported proto_id: 0x%02x\n", proto_id); + return -EINVAL; + } + + name_start = strstr(user_buf, proto_prefix); + if (!name_start) { + pr_err("Invalid emulated name %s. Must start with %s\n", + user_buf, proto_prefix); + return -EINVAL; + } + + switch (proto_id) { + case SCSI_PROTOCOL_SAS: + sprintf(acl_name, name_start); + break; + case SCSI_PROTOCOL_FCP: + sprintf(acl_name, &name_start[3]); /* Skip over "fc." */ + break; + case SCSI_PROTOCOL_ISCSI: + sprintf(acl_name, name_start); + break; + } + + if (acl_name[user_len - 1] == '\n') + acl_name[user_len - 1] = '\0'; + + if (proto_id == SCSI_PROTOCOL_SAS) { + /* + * target_setup_session will want the naa. prefix to match + * the ACL name, but the t10 transport id only wants the + * address. + */ + *tpt_id_name = acl_name + 4; + } else { + *tpt_id_name = acl_name; + } + + return 0; +} +EXPORT_SYMBOL(target_parse_emulated_name); + struct t10_transport_id *target_create_transport_id(u8 proto, const char *name, const char *session_id) { diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index af1dd81..0113e1c 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h @@ -125,6 +125,8 @@ struct target_core_fabric_ops { int target_depend_item(struct config_item *item); void target_undepend_item(struct config_item *item); +int target_parse_emulated_name(u8, const char *, unsigned char *, int, + unsigned char **); struct t10_transport_id *target_create_transport_id(u8, const char *, const char *); void target_free_transport_id(struct t10_transport_id *); -- 1.8.3.1
next prev parent reply other threads:[~2020-05-10 21:57 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-10 21:57 [PATCH v5 00/15] target: add sysfs support Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-10 21:57 ` [PATCH 01/15] target: check enforce_pr_isids during registration Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:08 ` Hannes Reinecke 2020-05-11 6:08 ` Hannes Reinecke 2020-05-13 20:55 ` Lee Duncan 2020-05-13 20:55 ` Lee Duncan 2020-05-10 21:57 ` [PATCH 02/15] target: separate acl name from port ids Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:09 ` Hannes Reinecke 2020-05-11 6:09 ` Hannes Reinecke 2020-05-13 23:35 ` Lee Duncan 2020-05-13 23:35 ` Lee Duncan 2020-05-10 21:57 ` Mike Christie [this message] 2020-05-10 21:57 ` [PATCH 03/15] target: add helper to parse acl and transport name Mike Christie 2020-05-11 6:09 ` Hannes Reinecke 2020-05-11 6:09 ` Hannes Reinecke 2020-05-11 18:22 ` Bodo Stroesser 2020-05-11 18:22 ` Bodo Stroesser 2020-05-11 21:04 ` Mike Christie 2020-05-11 21:04 ` Mike Christie 2020-05-13 23:57 ` Lee Duncan 2020-05-13 23:57 ` Lee Duncan 2020-05-10 21:57 ` [PATCH 04/15] tcm loop: use target_parse_emulated_name Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:10 ` Hannes Reinecke 2020-05-11 6:10 ` Hannes Reinecke 2020-05-13 23:59 ` Lee Duncan 2020-05-13 23:59 ` Lee Duncan 2020-05-10 21:57 ` [PATCH 05/15] vhost scsi: " Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:11 ` Hannes Reinecke 2020-05-11 6:11 ` Hannes Reinecke 2020-05-10 21:57 ` [PATCH 06/15] xen scsiback: " Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:11 ` Hannes Reinecke 2020-05-11 6:11 ` Hannes Reinecke 2020-05-11 6:16 ` Jürgen Groß 2020-05-11 6:16 ` Jürgen Groß 2020-05-10 21:57 ` [PATCH 07/15] iscsi target: setup transport_id Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:12 ` Hannes Reinecke 2020-05-11 6:12 ` Hannes Reinecke 2020-05-10 21:57 ` [PATCH 08/15] target: use tpt_id in target_stat_iport_port_ident_show Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:13 ` Hannes Reinecke 2020-05-11 6:13 ` Hannes Reinecke 2020-05-10 21:57 ` [PATCH 09/15] target: drop sess_get_initiator_sid from PR code Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:13 ` Hannes Reinecke 2020-05-11 6:13 ` Hannes Reinecke 2020-05-10 21:57 ` [PATCH 10/15] target: drop sess_get_initiator_sid Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:14 ` Hannes Reinecke 2020-05-11 6:14 ` Hannes Reinecke 2020-05-10 21:57 ` [PATCH 11/15] target: add sysfs support Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 6:21 ` Hannes Reinecke 2020-05-11 6:21 ` Hannes Reinecke 2020-05-11 6:30 ` Greg Kroah-Hartman 2020-05-11 6:30 ` Greg Kroah-Hartman 2020-05-11 17:15 ` Mike Christie 2020-05-11 17:15 ` Mike Christie 2020-05-12 5:54 ` Greg Kroah-Hartman 2020-05-12 5:54 ` Greg Kroah-Hartman 2020-05-10 21:57 ` [PATCH 12/15] target: add sysfs session helper functions Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-11 18:39 ` Bodo Stroesser 2020-05-11 18:39 ` Bodo Stroesser 2020-05-11 19:21 ` Bart Van Assche 2020-05-11 19:21 ` Bart Van Assche 2020-05-11 20:16 ` Mike Christie 2020-05-11 20:16 ` Mike Christie 2020-05-12 11:19 ` Bodo Stroesser 2020-05-12 11:19 ` Bodo Stroesser 2020-05-12 15:55 ` Mike Christie 2020-05-12 15:55 ` Mike Christie 2020-05-10 21:57 ` [PATCH 13/15] target: add target_setup_session sysfs support Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-10 21:57 ` [PATCH 14/15] iscsi target: use session sysfs helpers Mike Christie 2020-05-10 21:57 ` Mike Christie 2020-05-10 21:57 ` [PATCH 15/15] target: drop sess_get_index Mike Christie 2020-05-10 21:57 ` Mike Christie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200510215744.21999-4-mchristi@redhat.com \ --to=mchristi@redhat.com \ --cc=bstroesser@ts.fujitsu.com \ --cc=bvanassche@acm.org \ --cc=jasowang@redhat.com \ --cc=jgross@suse.com \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=stefanha@redhat.com \ --cc=target-devel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.