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> Subject: [PATCH 03/11] iscsi target: setup transport_id Date: Tue, 28 Apr 2020 06:11:01 +0000 [thread overview] Message-ID: <20200428061109.3042-4-mchristi@redhat.com> (raw) In-Reply-To: <20200428061109.3042-1-mchristi@redhat.com> The iscsi target does its own session setup. This patch updates the driver so it sets up the transport id. Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/iscsi/iscsi_target_nego.c | 37 ++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c index 685d771..dce2fe2 100644 --- a/drivers/target/iscsi/iscsi_target_nego.c +++ b/drivers/target/iscsi/iscsi_target_nego.c @@ -1032,6 +1032,25 @@ static void iscsi_initiatorname_tolower( } } +static int iscsi_setup_i_tpid(struct iscsi_session *sess, char *iname) +{ + struct t10_transport_id tpid; + char isid_buf[13]; + + sprintf(isid_buf, "%6phN", sess->isid); + + memset(&tpid, 0, sizeof(tpid)); + tpid.proto = SCSI_PROTOCOL_ISCSI; + tpid.name = iname; + tpid.session_id = isid_buf; + + sess->se_sess->tpid = target_cp_transport_id(&tpid); + if (!sess->se_sess->tpid) + return -ENOMEM; + + return 0; +} + /* * Processes the first Login Request.. */ @@ -1260,11 +1279,21 @@ int iscsi_target_locate_portal( tag_size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size; ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size); - if (ret < 0) { - iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, - ISCSI_LOGIN_STATUS_NO_RESOURCES); - ret = -1; + if (ret < 0) + goto return_oom; + + if (conn->tpg != iscsit_global->discovery_tpg) { + if (iscsi_setup_i_tpid(sess, i_buf)) + /* tags and nacl released when session is freed */ + goto return_oom; } + + goto out; + +return_oom: + iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, + ISCSI_LOGIN_STATUS_NO_RESOURCES); + ret = -1; out: kfree(tmpbuf); return ret; -- 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> Subject: [PATCH 03/11] iscsi target: setup transport_id Date: Tue, 28 Apr 2020 01:11:01 -0500 [thread overview] Message-ID: <20200428061109.3042-4-mchristi@redhat.com> (raw) In-Reply-To: <20200428061109.3042-1-mchristi@redhat.com> The iscsi target does its own session setup. This patch updates the driver so it sets up the transport id. Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/iscsi/iscsi_target_nego.c | 37 ++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c index 685d771..dce2fe2 100644 --- a/drivers/target/iscsi/iscsi_target_nego.c +++ b/drivers/target/iscsi/iscsi_target_nego.c @@ -1032,6 +1032,25 @@ static void iscsi_initiatorname_tolower( } } +static int iscsi_setup_i_tpid(struct iscsi_session *sess, char *iname) +{ + struct t10_transport_id tpid; + char isid_buf[13]; + + sprintf(isid_buf, "%6phN", sess->isid); + + memset(&tpid, 0, sizeof(tpid)); + tpid.proto = SCSI_PROTOCOL_ISCSI; + tpid.name = iname; + tpid.session_id = isid_buf; + + sess->se_sess->tpid = target_cp_transport_id(&tpid); + if (!sess->se_sess->tpid) + return -ENOMEM; + + return 0; +} + /* * Processes the first Login Request.. */ @@ -1260,11 +1279,21 @@ int iscsi_target_locate_portal( tag_size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size; ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size); - if (ret < 0) { - iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, - ISCSI_LOGIN_STATUS_NO_RESOURCES); - ret = -1; + if (ret < 0) + goto return_oom; + + if (conn->tpg != iscsit_global->discovery_tpg) { + if (iscsi_setup_i_tpid(sess, i_buf)) + /* tags and nacl released when session is freed */ + goto return_oom; } + + goto out; + +return_oom: + iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, + ISCSI_LOGIN_STATUS_NO_RESOURCES); + ret = -1; out: kfree(tmpbuf); return ret; -- 1.8.3.1
next prev parent reply other threads:[~2020-04-28 6:11 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-28 6:10 [PATCH 00/11] target: add sysfs support Mike Christie 2020-04-28 6:10 ` Mike Christie 2020-04-28 6:10 ` [PATCH 01/11] target: check enforce_pr_isids during registration Mike Christie 2020-04-28 6:10 ` Mike Christie 2020-04-28 6:11 ` [PATCH 02/11] target: separate acl name from port ids Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:14 ` Bart Van Assche 2020-04-28 16:14 ` Bart Van Assche 2020-04-28 6:11 ` Mike Christie [this message] 2020-04-28 6:11 ` [PATCH 03/11] iscsi target: setup transport_id Mike Christie 2020-04-28 6:11 ` [PATCH 04/11] target: use tpid in target_stat_iport_port_ident_show Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 05/11] target: drop sess_get_initiator_sid from PR code Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 06/11] target: drop sess_get_initiator_sid Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:25 ` Bart Van Assche 2020-04-28 16:25 ` Bart Van Assche 2020-04-28 6:11 ` [PATCH 07/11] target: add sysfs support Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:29 ` Bart Van Assche 2020-04-28 16:29 ` Bart Van Assche 2020-04-28 16:33 ` Mike Christie 2020-04-28 16:33 ` Mike Christie 2020-04-28 6:11 ` [PATCH 08/11] target: add sysfs session helper functions Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:43 ` Bart Van Assche 2020-04-28 16:43 ` Bart Van Assche 2020-04-28 17:06 ` Mike Christie 2020-04-28 17:06 ` Mike Christie 2020-04-28 6:11 ` [PATCH 09/11] target: add target_setup_session sysfs support Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 10/11] iscsi target: use session sysfs helpers Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 11/11] target: drop sess_get_index Mike Christie 2020-04-28 6:11 ` 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=20200428061109.3042-4-mchristi@redhat.com \ --to=mchristi@redhat.com \ --cc=bstroesser@ts.fujitsu.com \ --cc=bvanassche@acm.org \ --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.