From: Mike Christie <michael.christie@oracle.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [PATCH 06/17] xen scsiback: use target_parse_emulated_name Date: Sun, 07 Jun 2020 20:35:53 +0000 [thread overview] Message-ID: <1591562164-9766-7-git-send-email-michael.christie@oracle.com> (raw) In-Reply-To: <1591562164-9766-1-git-send-email-michael.christie@oracle.com> Use target_parse_emulated_name so the acl and SCSI names are properly formatted. Cc: Juergen Gross <jgross@suse.com> Signed-off-by: Mike Christie <michael.christie@oracle.com> Acked-by: Juergen Gross <jgross@suse.com> Reviewed-by: Hannes Reinecke <hare@suse.de> --- drivers/xen/xen-scsiback.c | 66 ++++++++-------------------------------------- 1 file changed, 11 insertions(+), 55 deletions(-) diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 93cb386..f70b6da 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -1509,7 +1509,8 @@ static int scsiback_alloc_sess_cb(struct se_portal_group *se_tpg, } static int scsiback_make_nexus(struct scsiback_tpg *tpg, - const char *name) + const char *tpt_id_name, + const char *acl_name) { struct scsiback_nexus *tv_nexus; int ret = 0; @@ -1530,8 +1531,9 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg, tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg, VSCSI_DEFAULT_SESSION_TAGS, sizeof(struct vscsibk_pend), - TARGET_PROT_NORMAL, name, - name, tv_nexus, + TARGET_PROT_NORMAL, + tpt_id_name, acl_name, + tv_nexus, scsiback_alloc_sess_cb); if (IS_ERR(tv_nexus->tvn_se_sess)) { kfree(tv_nexus); @@ -1619,7 +1621,7 @@ static ssize_t scsiback_tpg_nexus_store(struct config_item *item, struct scsiback_tpg *tpg = container_of(se_tpg, struct scsiback_tpg, se_tpg); struct scsiback_tport *tport_wwn = tpg->tport; - unsigned char i_port[VSCSI_NAMELEN], *ptr, *port_ptr; + unsigned char i_port[VSCSI_NAMELEN], *tpt_id_name; int ret; /* * Shutdown the active I_T nexus if 'NULL' is passed. @@ -1628,59 +1630,13 @@ static ssize_t scsiback_tpg_nexus_store(struct config_item *item, ret = scsiback_drop_nexus(tpg); return (!ret) ? count : ret; } - /* - * Otherwise make sure the passed virtual Initiator port WWN matches - * the fabric protocol_id set in scsiback_make_tport(), and call - * scsiback_make_nexus(). - */ - if (strlen(page) >= VSCSI_NAMELEN) { - pr_err("Emulated NAA Sas Address: %s, exceeds max: %d\n", - page, VSCSI_NAMELEN); - return -EINVAL; - } - snprintf(&i_port[0], VSCSI_NAMELEN, "%s", page); - ptr = strstr(i_port, "naa."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_SAS) { - pr_err("Passed SAS Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[0]; - goto check_newline; - } - ptr = strstr(i_port, "fc."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_FCP) { - pr_err("Passed FCP Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[3]; /* Skip over "fc." */ - goto check_newline; - } - ptr = strstr(i_port, "iqn."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_ISCSI) { - pr_err("Passed iSCSI Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[0]; - goto check_newline; - } - pr_err("Unable to locate prefix for emulated Initiator Port: %s\n", - i_port); - return -EINVAL; - /* - * Clear any trailing newline for the NAA WWN - */ -check_newline: - if (i_port[strlen(i_port) - 1] = '\n') - i_port[strlen(i_port) - 1] = '\0'; + ret = target_parse_emulated_name(tport_wwn->tport_proto_id, page, + i_port, VSCSI_NAMELEN, &tpt_id_name); + if (ret) + return ret; - ret = scsiback_make_nexus(tpg, port_ptr); + ret = scsiback_make_nexus(tpg, tpt_id_name, i_port); if (ret < 0) return ret; -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <michael.christie@oracle.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [PATCH 06/17] xen scsiback: use target_parse_emulated_name Date: Sun, 7 Jun 2020 15:35:53 -0500 [thread overview] Message-ID: <1591562164-9766-7-git-send-email-michael.christie@oracle.com> (raw) In-Reply-To: <1591562164-9766-1-git-send-email-michael.christie@oracle.com> Use target_parse_emulated_name so the acl and SCSI names are properly formatted. Cc: Juergen Gross <jgross@suse.com> Signed-off-by: Mike Christie <michael.christie@oracle.com> Acked-by: Juergen Gross <jgross@suse.com> Reviewed-by: Hannes Reinecke <hare@suse.de> --- drivers/xen/xen-scsiback.c | 66 ++++++++-------------------------------------- 1 file changed, 11 insertions(+), 55 deletions(-) diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 93cb386..f70b6da 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -1509,7 +1509,8 @@ static int scsiback_alloc_sess_cb(struct se_portal_group *se_tpg, } static int scsiback_make_nexus(struct scsiback_tpg *tpg, - const char *name) + const char *tpt_id_name, + const char *acl_name) { struct scsiback_nexus *tv_nexus; int ret = 0; @@ -1530,8 +1531,9 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg, tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg, VSCSI_DEFAULT_SESSION_TAGS, sizeof(struct vscsibk_pend), - TARGET_PROT_NORMAL, name, - name, tv_nexus, + TARGET_PROT_NORMAL, + tpt_id_name, acl_name, + tv_nexus, scsiback_alloc_sess_cb); if (IS_ERR(tv_nexus->tvn_se_sess)) { kfree(tv_nexus); @@ -1619,7 +1621,7 @@ static ssize_t scsiback_tpg_nexus_store(struct config_item *item, struct scsiback_tpg *tpg = container_of(se_tpg, struct scsiback_tpg, se_tpg); struct scsiback_tport *tport_wwn = tpg->tport; - unsigned char i_port[VSCSI_NAMELEN], *ptr, *port_ptr; + unsigned char i_port[VSCSI_NAMELEN], *tpt_id_name; int ret; /* * Shutdown the active I_T nexus if 'NULL' is passed. @@ -1628,59 +1630,13 @@ static ssize_t scsiback_tpg_nexus_store(struct config_item *item, ret = scsiback_drop_nexus(tpg); return (!ret) ? count : ret; } - /* - * Otherwise make sure the passed virtual Initiator port WWN matches - * the fabric protocol_id set in scsiback_make_tport(), and call - * scsiback_make_nexus(). - */ - if (strlen(page) >= VSCSI_NAMELEN) { - pr_err("Emulated NAA Sas Address: %s, exceeds max: %d\n", - page, VSCSI_NAMELEN); - return -EINVAL; - } - snprintf(&i_port[0], VSCSI_NAMELEN, "%s", page); - ptr = strstr(i_port, "naa."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_SAS) { - pr_err("Passed SAS Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[0]; - goto check_newline; - } - ptr = strstr(i_port, "fc."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_FCP) { - pr_err("Passed FCP Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[3]; /* Skip over "fc." */ - goto check_newline; - } - ptr = strstr(i_port, "iqn."); - if (ptr) { - if (tport_wwn->tport_proto_id != SCSI_PROTOCOL_ISCSI) { - pr_err("Passed iSCSI Initiator Port %s does not match target port protoid: %s\n", - i_port, scsiback_dump_proto_id(tport_wwn)); - return -EINVAL; - } - port_ptr = &i_port[0]; - goto check_newline; - } - pr_err("Unable to locate prefix for emulated Initiator Port: %s\n", - i_port); - return -EINVAL; - /* - * Clear any trailing newline for the NAA WWN - */ -check_newline: - if (i_port[strlen(i_port) - 1] == '\n') - i_port[strlen(i_port) - 1] = '\0'; + ret = target_parse_emulated_name(tport_wwn->tport_proto_id, page, + i_port, VSCSI_NAMELEN, &tpt_id_name); + if (ret) + return ret; - ret = scsiback_make_nexus(tpg, port_ptr); + ret = scsiback_make_nexus(tpg, tpt_id_name, i_port); if (ret < 0) return ret; -- 1.8.3.1
next prev parent reply other threads:[~2020-06-07 20:35 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-07 20:35 [PATCH v6 00/17] target: add sysfs support Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 01/17] target: check enforce_pr_isids during registration Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 02/17] target: separate acl name from port ids Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-09 10:11 ` Stefan Hajnoczi 2020-06-09 10:11 ` Stefan Hajnoczi 2020-06-09 14:13 ` Himanshu Madhani 2020-06-09 14:13 ` Himanshu Madhani 2020-06-07 20:35 ` [PATCH 03/17] target: add helper to parse acl and transport name Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 04/17] tcm loop: use target_parse_emulated_name Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 05/17] vhost scsi: " Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-09 10:21 ` Stefan Hajnoczi 2020-06-09 10:21 ` Stefan Hajnoczi 2020-06-07 20:35 ` Mike Christie [this message] 2020-06-07 20:35 ` [PATCH 06/17] xen scsiback: " Mike Christie 2020-06-07 20:35 ` [PATCH 07/17] iscsi target: setup transport_id Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 08/17] target: use tpt_id in target_stat_iport_port_ident_show Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 09/17] target: drop sess_get_initiator_sid from PR code Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 10/17] target: drop sess_get_initiator_sid Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-07 20:35 ` [PATCH 11/17] target: add session sysfs class support Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-08 5:32 ` Greg Kroah-Hartman 2020-06-08 5:32 ` Greg Kroah-Hartman 2020-06-08 15:35 ` Mike Christie 2020-06-08 15:35 ` Mike Christie 2020-06-08 16:36 ` Greg Kroah-Hartman 2020-06-08 16:36 ` Greg Kroah-Hartman 2020-06-08 19:02 ` Mike Christie 2020-06-08 19:02 ` Mike Christie 2020-06-09 6:05 ` Greg Kroah-Hartman 2020-06-09 6:05 ` Greg Kroah-Hartman 2020-06-08 6:14 ` Hannes Reinecke 2020-06-08 6:14 ` Hannes Reinecke 2020-06-08 15:21 ` Mike Christie 2020-06-08 15:21 ` Mike Christie 2020-06-08 15:55 ` Michael Christie 2020-06-08 15:55 ` Michael Christie 2020-06-09 3:10 ` Michael Christie 2020-06-09 3:10 ` Michael Christie 2020-06-08 12:06 ` Bodo Stroesser 2020-06-08 12:06 ` Bodo Stroesser 2020-06-08 14:49 ` Mike Christie 2020-06-08 14:49 ` Mike Christie 2020-06-08 12:18 ` Greg Kroah-Hartman 2020-06-08 12:18 ` Greg Kroah-Hartman 2020-06-08 12:18 ` Greg Kroah-Hartman 2020-06-08 12:18 ` Greg Kroah-Hartman 2020-06-07 20:35 ` [PATCH 12/17] target: hook most target users into sysfs API Mike Christie 2020-06-07 20:35 ` Mike Christie 2020-06-08 6:15 ` Hannes Reinecke 2020-06-08 6:15 ` Hannes Reinecke 2020-06-08 10:20 ` kernel test robot 2020-06-08 10:20 ` kernel test robot 2020-06-08 10:20 ` kernel test robot 2020-06-07 20:36 ` [PATCH 13/17] iscsi target: replace module sids with lio's sid Mike Christie 2020-06-07 20:36 ` Mike Christie 2020-06-08 6:16 ` Hannes Reinecke 2020-06-08 6:16 ` Hannes Reinecke 2020-06-07 20:36 ` [PATCH 14/17] target: add free_session callout Mike Christie 2020-06-07 20:36 ` Mike Christie 2020-06-08 6:19 ` Hannes Reinecke 2020-06-08 6:19 ` Hannes Reinecke 2020-06-07 20:36 ` [PATCH 15/17] iscsi target: hook iscsi target into sysfs API Mike Christie 2020-06-07 20:36 ` Mike Christie 2020-06-08 6:20 ` Hannes Reinecke 2020-06-08 6:20 ` Hannes Reinecke 2020-06-07 20:36 ` [PATCH 16/17] iscsi target: export session state and alias in sysfs Mike Christie 2020-06-07 20:36 ` Mike Christie 2020-06-08 6:21 ` Hannes Reinecke 2020-06-08 6:21 ` Hannes Reinecke 2020-06-07 20:36 ` [PATCH 17/17] target: drop sess_get_index Mike Christie 2020-06-07 20:36 ` Mike Christie 2020-06-08 6:21 ` Hannes Reinecke 2020-06-08 6:21 ` Hannes Reinecke
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=1591562164-9766-7-git-send-email-michael.christie@oracle.com \ --to=michael.christie@oracle.com \ --cc=bstroesser@ts.fujitsu.com \ --cc=bvanassche@acm.org \ --cc=jgross@suse.com \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.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.