* [PATCH 00/11] target: add sysfs support
@ 2020-04-28 6:10 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:10 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
The following patches made over Linus's current tree allow lio to
export info about structs that the kernel initiates creation of
via events like initiator login where there is no user interaction
like a mkdir. These patches specificially focus on the
I_T_nexus/session but could be used for other objects if we want.
Why sysfs when we have configfs?
I started with configfs and hit bugs like:
commit cc57c07343bd071cdf1915a91a24ab7d40c9b590
Author: Mike Christie <mchristi@redhat.com>
Date: Sun Jul 15 18:16:17 2018 -0500
configfs: fix registered group removal
but it turns out that bug was not really a bug and was just how
configfs was meant to work. It seems it was not meant to be used
where the kernel initiates creation of dirs/files as a result of
some internal action. It's more geared to the user initiating
the creation, and my patch just lead to other bugs and was
reverted:
commit f19e4ed1e1edbfa3c9ccb9fed17759b7d6db24c6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Aug 29 23:13:30 2019 -0400
configfs_register_group() shouldn't be (and isn't) called in
rmdirable parts
So to export the session info we have debugfs, sysfs, ioctl,
netlink, etc. sysfs just seemed like a decent fit since one of the
primary users is rtslib and it already has lots of file/dir
handling code.
V3:
- drop format field
- delay tpg deletion to allow fabric modules time to remove their
sessions.
- Added root sessions dir for easier lookup if userspace has the
session id.
- add session symlink
- use simple ida.
- Fix goto use. Actually moved sysfs addition call to after nego
to avoid sysfs additions when login ends up failing.
- Dropped target_setup_session callback fixups and dropped the
init/free session callback for now. It's not immediately needed
for this base session sysfs info support.
V2:
- rename top level dir to scsi_target
- Fix extra newline
- Copy data that's exported to sysfs so we do not have to worry about
configfs and sysfs refcounts.
- Export session info needed for tracking sessions in userspace and
handling commands like PGRs there (still needs a way to notify userspace
when sessions are added/deleted, but that will be a different set since
the focus is different).
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH 00/11] target: add sysfs support
@ 2020-04-28 6:10 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:10 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
The following patches made over Linus's current tree allow lio to
export info about structs that the kernel initiates creation of
via events like initiator login where there is no user interaction
like a mkdir. These patches specificially focus on the
I_T_nexus/session but could be used for other objects if we want.
Why sysfs when we have configfs?
I started with configfs and hit bugs like:
commit cc57c07343bd071cdf1915a91a24ab7d40c9b590
Author: Mike Christie <mchristi@redhat.com>
Date: Sun Jul 15 18:16:17 2018 -0500
configfs: fix registered group removal
but it turns out that bug was not really a bug and was just how
configfs was meant to work. It seems it was not meant to be used
where the kernel initiates creation of dirs/files as a result of
some internal action. It's more geared to the user initiating
the creation, and my patch just lead to other bugs and was
reverted:
commit f19e4ed1e1edbfa3c9ccb9fed17759b7d6db24c6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Aug 29 23:13:30 2019 -0400
configfs_register_group() shouldn't be (and isn't) called in
rmdirable parts
So to export the session info we have debugfs, sysfs, ioctl,
netlink, etc. sysfs just seemed like a decent fit since one of the
primary users is rtslib and it already has lots of file/dir
handling code.
V3:
- drop format field
- delay tpg deletion to allow fabric modules time to remove their
sessions.
- Added root sessions dir for easier lookup if userspace has the
session id.
- add session symlink
- use simple ida.
- Fix goto use. Actually moved sysfs addition call to after nego
to avoid sysfs additions when login ends up failing.
- Dropped target_setup_session callback fixups and dropped the
init/free session callback for now. It's not immediately needed
for this base session sysfs info support.
V2:
- rename top level dir to scsi_target
- Fix extra newline
- Copy data that's exported to sysfs so we do not have to worry about
configfs and sysfs refcounts.
- Export session info needed for tracking sessions in userspace and
handling commands like PGRs there (still needs a way to notify userspace
when sessions are added/deleted, but that will be a different set since
the focus is different).
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH 01/11] target: check enforce_pr_isids during registration
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:10 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:10 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Move the check for enforce_pr_isids to the registration code where we
can fail at the time an initiator tries to register a path without an
isid. In its current place in __core_scsi3_locate_pr_reg, it is too
late because it can be registered and be reported in PR in commands and
it is stuck in this state because we cannot unregister it.
Note.
I am including in this patchset, because the 5th patch is built on top.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_pr.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 5e93169..cd2d32f 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -1176,15 +1176,6 @@ static struct t10_pr_registration *__core_scsi3_locate_pr_reg(
* ISID, then we have found a match.
*/
if (!pr_reg->isid_present_at_reg) {
- /*
- * Determine if this SCSI device server requires that
- * SCSI Intiatior TransportID w/ ISIDs is enforced
- * for fabric modules (iSCSI) requiring them.
- */
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- if (dev->dev_attrib.enforce_pr_isids)
- continue;
- }
atomic_inc_mb(&pr_reg->pr_res_holders);
spin_unlock(&pr_tmpl->registration_lock);
return pr_reg;
@@ -1591,10 +1582,25 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve)
continue;
dest_rtpi = tmp_lun->lun_rtpi;
+ iport_ptr = NULL;
i_str = target_parse_pr_out_transport_id(tmp_tpg,
ptr, &tid_len, &iport_ptr);
if (!i_str)
continue;
+ /*
+ * Determine if this SCSI device server requires that
+ * SCSI Intiatior TransportID w/ ISIDs is enforced
+ * for fabric modules (iSCSI) requiring them.
+ */
+ if (tpg->se_tpg_tfo->sess_get_initiator_sid &&
+ dev->dev_attrib.enforce_pr_isids &&
+ !iport_ptr) {
+ pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.",
+ i_str);
+ ret = TCM_INVALID_PARAMETER_LIST;
+ spin_unlock(&dev->se_port_lock);
+ goto out_unmap;
+ }
atomic_inc_mb(&tmp_tpg->tpg_pr_ref_count);
spin_unlock(&dev->se_port_lock);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 01/11] target: check enforce_pr_isids during registration
@ 2020-04-28 6:10 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:10 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Move the check for enforce_pr_isids to the registration code where we
can fail at the time an initiator tries to register a path without an
isid. In its current place in __core_scsi3_locate_pr_reg, it is too
late because it can be registered and be reported in PR in commands and
it is stuck in this state because we cannot unregister it.
Note.
I am including in this patchset, because the 5th patch is built on top.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_pr.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 5e93169..cd2d32f 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -1176,15 +1176,6 @@ static struct t10_pr_registration *__core_scsi3_locate_pr_reg(
* ISID, then we have found a match.
*/
if (!pr_reg->isid_present_at_reg) {
- /*
- * Determine if this SCSI device server requires that
- * SCSI Intiatior TransportID w/ ISIDs is enforced
- * for fabric modules (iSCSI) requiring them.
- */
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- if (dev->dev_attrib.enforce_pr_isids)
- continue;
- }
atomic_inc_mb(&pr_reg->pr_res_holders);
spin_unlock(&pr_tmpl->registration_lock);
return pr_reg;
@@ -1591,10 +1582,25 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve)
continue;
dest_rtpi = tmp_lun->lun_rtpi;
+ iport_ptr = NULL;
i_str = target_parse_pr_out_transport_id(tmp_tpg,
ptr, &tid_len, &iport_ptr);
if (!i_str)
continue;
+ /*
+ * Determine if this SCSI device server requires that
+ * SCSI Intiatior TransportID w/ ISIDs is enforced
+ * for fabric modules (iSCSI) requiring them.
+ */
+ if (tpg->se_tpg_tfo->sess_get_initiator_sid &&
+ dev->dev_attrib.enforce_pr_isids &&
+ !iport_ptr) {
+ pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.",
+ i_str);
+ ret = TCM_INVALID_PARAMETER_LIST;
+ spin_unlock(&dev->se_port_lock);
+ goto out_unmap;
+ }
atomic_inc_mb(&tmp_tpg->tpg_pr_ref_count);
spin_unlock(&dev->se_port_lock);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 02/11] target: separate acl name from port ids
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
The PGR code assumes the ACL name is going to be based on the SPC4
transportID type of values. The problem is that for iSCSI we have an
extra session id as part of the SCSI port id and some fabric modules
support or would like to support non transportID values for the ACL
name. For example, iSCSI and SRP would like to use the source address
for the ACL name, but that is not a valud transportID value that you
can get in a PGR request.
This patch adds a new transport_id struct which maps to the SPC
transportID. In the future will be used for PGR commands instead of
the ACL name. In this patchset, it is used to export the initiator
info in the session's sysfs dir, so tools can disply the info and
daemons that execute commands like PGRs in userspace can build a
session id to I_T nexus mapping.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V3:
- drop format
drivers/infiniband/ulp/srpt/ib_srpt.c | 13 +++++++----
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 9 ++++++--
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 8 ++++++-
drivers/target/loopback/tcm_loop.c | 20 ++++++++++++++--
drivers/target/sbp/sbp_target.c | 9 ++++++--
drivers/target/target_core_fabric_lib.c | 39 ++++++++++++++++++++++++++++++++
drivers/target/target_core_internal.h | 1 +
drivers/target/target_core_transport.c | 26 ++++++++++++++-------
drivers/target/tcm_fc/tfc_sess.c | 10 ++++++--
drivers/usb/gadget/function/f_tcm.c | 10 ++++++--
drivers/vhost/scsi.c | 20 +++++++++++++---
drivers/xen/xen-scsiback.c | 23 +++++++++++++++----
include/target/target_core_base.h | 12 ++++++++++
include/target/target_core_fabric.h | 3 ++-
14 files changed, 172 insertions(+), 31 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 9855274..9952731 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2144,6 +2144,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
const char *src_addr)
{
struct srpt_port *sport = &sdev->port[port_num - 1];
+ struct t10_transport_id tpid;
struct srpt_nexus *nexus;
struct srp_login_rsp *rsp = NULL;
struct srp_login_rej *rej = NULL;
@@ -2314,13 +2315,17 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
tag_num = ch->rq_size;
tag_size = 1; /* ib_srpt does not use se_sess->sess_cmd_map */
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SRP;
+ tpid.name = i_port_id + 2;
+
mutex_lock(&sport->port_guid_id.mutex);
list_for_each_entry(stpg, &sport->port_guid_id.tpg_list, entry) {
if (!IS_ERR_OR_NULL(ch->sess))
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL,
- ch->sess_name, ch, NULL);
+ &tpid, ch->sess_name, ch, NULL);
}
mutex_unlock(&sport->port_guid_id.mutex);
@@ -2329,14 +2334,14 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
if (!IS_ERR_OR_NULL(ch->sess))
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
- tag_size, TARGET_PROT_NORMAL, i_port_id,
- ch, NULL);
+ tag_size, TARGET_PROT_NORMAL, &tpid,
+ i_port_id, ch, NULL);
if (!IS_ERR_OR_NULL(ch->sess))
break;
/* Retry without leading "0x" */
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL,
- i_port_id + 2, ch, NULL);
+ &tpid, i_port_id + 2, ch, NULL);
}
mutex_unlock(&sport->port_gid_id.mutex);
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index d9e94e8..20c750f 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -2208,6 +2208,7 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
{
char *name = tport->tport_name;
struct ibmvscsis_nexus *nexus;
+ struct t10_transport_id tpid;
struct scsi_info *vscsi = container_of(tport, struct scsi_info, tport);
int rc;
@@ -2222,9 +2223,13 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
return -ENOMEM;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SRP;
+ tpid.name = name;
+
nexus->se_sess = target_setup_session(&tport->se_tpg, 0, 0,
- TARGET_PROT_NORMAL, name, nexus,
- NULL);
+ TARGET_PROT_NORMAL, &tpid, name,
+ nexus, NULL);
if (IS_ERR(nexus->se_sess)) {
rc = PTR_ERR(nexus->se_sess);
goto transport_init_fail;
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index abe7f79..517c698 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1428,6 +1428,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
{
struct qla_hw_data *ha = vha->hw;
struct tcm_qla2xxx_lport *lport;
+ struct t10_transport_id tpid;
struct tcm_qla2xxx_tpg *tpg;
struct se_session *se_sess;
unsigned char port_name[36];
@@ -1454,13 +1455,18 @@ static int tcm_qla2xxx_check_initiator_node_acl(
*/
memset(&port_name, 0, 36);
snprintf(port_name, sizeof(port_name), "%8phC", fc_wwpn);
+
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_FCP;
+ tpid.name = port_name;
+
/*
* Locate our struct se_node_acl either from an explict NodeACL created
* via ConfigFS, or via running in TPG demo mode.
*/
se_sess = target_setup_session(&tpg->se_tpg, num_tags,
sizeof(struct qla_tgt_cmd),
- TARGET_PROT_ALL, port_name,
+ TARGET_PROT_ALL, &tpid, port_name,
qlat_sess, tcm_qla2xxx_session_cb);
if (IS_ERR(se_sess))
return PTR_ERR(se_sess);
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 3305b47..7ea0738 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -725,10 +725,11 @@ static int tcm_loop_alloc_sess_cb(struct se_portal_group *se_tpg,
static int tcm_loop_make_nexus(
struct tcm_loop_tpg *tl_tpg,
- const char *name)
+ char *name)
{
struct tcm_loop_hba *tl_hba = tl_tpg->tl_hba;
struct tcm_loop_nexus *tl_nexus;
+ struct t10_transport_id tpid;
int ret;
if (tl_tpg->tl_nexus) {
@@ -736,13 +737,28 @@ static int tcm_loop_make_nexus(
return -EEXIST;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tl_hba->tl_proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tl_nexus = kzalloc(sizeof(*tl_nexus), GFP_KERNEL);
if (!tl_nexus)
return -ENOMEM;
tl_nexus->se_sess = target_setup_session(&tl_tpg->tl_se_tpg, 0, 0,
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,
- name, tl_nexus, tcm_loop_alloc_sess_cb);
+ &tpid, name, tl_nexus,
+ tcm_loop_alloc_sess_cb);
if (IS_ERR(tl_nexus->se_sess)) {
ret = PTR_ERR(tl_nexus->se_sess);
kfree(tl_nexus);
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index e4a9b9f..0eb1072 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -181,6 +181,7 @@ static struct sbp_session *sbp_session_create(
struct sbp_tpg *tpg,
u64 guid)
{
+ struct t10_transport_id tpid;
struct sbp_session *sess;
int ret;
char guid_str[17];
@@ -196,10 +197,14 @@ static struct sbp_session *sbp_session_create(
INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work);
sess->guid = guid;
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SBP;
+ tpid.name = guid_str;
+
sess->se_sess = target_setup_session(&tpg->se_tpg, 128,
sizeof(struct sbp_target_request),
- TARGET_PROT_NORMAL, guid_str,
- sess, NULL);
+ TARGET_PROT_NORMAL, &tpid,
+ guid_str, sess, NULL);
if (IS_ERR(sess->se_sess)) {
pr_err("failed to init se_session\n");
ret = PTR_ERR(sess->se_sess);
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index 6b4b354..03f9ece 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -421,3 +421,42 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
*out_tid_len = 24;
return buf + offset;
}
+
+struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *src)
+{
+ struct t10_transport_id *dst;
+
+ dst = kzalloc(sizeof(*dst), GFP_KERNEL);
+ if (!dst)
+ return NULL;
+ dst->proto = src->proto;
+
+ dst->name = kstrdup(src->name, GFP_KERNEL);
+ if (!dst->name)
+ goto free_tpid;
+
+ if (src->session_id) {
+ dst->session_id = kstrdup(src->session_id, GFP_KERNEL);
+ if (!dst->session_id)
+ goto free_name;
+ }
+
+ return dst;
+
+free_name:
+ kfree(dst->name);
+free_tpid:
+ kfree(dst);
+ return NULL;
+}
+EXPORT_SYMBOL(target_cp_transport_id);
+
+void target_free_transport_id(struct t10_transport_id *tpid)
+{
+ if (!tpid)
+ return;
+
+ kfree(tpid->name);
+ kfree(tpid->session_id);
+ kfree(tpid);
+}
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 8533444..5e016aa 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -104,6 +104,7 @@ int target_get_pr_transport_id(struct se_node_acl *nacl,
unsigned char *buf);
const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
char *buf, u32 *out_tid_len, char **port_nexus_ptr);
+void target_free_transport_id(struct t10_transport_id *tpid);
/* target_core_hba.c */
struct se_hba *core_alloc_hba(const char *, u32, u32);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 0ae9e60..7715a723 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -416,12 +416,13 @@ void transport_register_session(
struct se_session *
target_setup_session(struct se_portal_group *tpg,
unsigned int tag_num, unsigned int tag_size,
- enum target_prot_op prot_op,
+ enum target_prot_op prot_op, struct t10_transport_id *tpid,
const char *initiatorname, void *private,
int (*callback)(struct se_portal_group *,
struct se_session *, void *))
{
struct se_session *sess;
+ int rc;
/*
* If the fabric driver is using percpu-ida based pre allocation
@@ -435,26 +436,34 @@ struct se_session *
if (IS_ERR(sess))
return sess;
+ sess->tpid = target_cp_transport_id(tpid);
+ if (!sess->tpid) {
+ rc = -ENOMEM;
+ goto free_sess;
+ }
+
sess->se_node_acl = core_tpg_check_initiator_node_acl(tpg,
(unsigned char *)initiatorname);
if (!sess->se_node_acl) {
- transport_free_session(sess);
- return ERR_PTR(-EACCES);
+ rc = -EACCES;
+ goto free_sess;
}
/*
* Go ahead and perform any remaining fabric setup that is
* required before transport_register_session().
*/
if (callback != NULL) {
- int rc = callback(tpg, sess, private);
- if (rc) {
- transport_free_session(sess);
- return ERR_PTR(rc);
- }
+ rc = callback(tpg, sess, private);
+ if (rc)
+ goto free_sess;
}
transport_register_session(tpg, sess->se_node_acl, sess, private);
return sess;
+
+free_sess:
+ transport_free_session(sess);
+ return ERR_PTR(rc);
}
EXPORT_SYMBOL(target_setup_session);
@@ -579,6 +588,7 @@ void transport_free_session(struct se_session *se_sess)
sbitmap_queue_free(&se_sess->sess_tag_pool);
kvfree(se_sess->sess_cmd_map);
}
+ target_free_transport_id(se_sess->tpid);
percpu_ref_exit(&se_sess->cmd_count);
kmem_cache_free(se_sess_cache, se_sess);
}
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 4fd6a1d..6e172ff 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -208,6 +208,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
struct fc_rport_priv *rdata)
{
struct se_portal_group *se_tpg = &tport->tpg->se_tpg;
+ struct t10_transport_id tpid;
struct ft_sess *sess;
struct hlist_head *head;
unsigned char initiatorname[TRANSPORT_IQN_LEN];
@@ -227,10 +228,15 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
sess->tport = tport;
sess->port_id = port_id;
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_FCP;
+ tpid.name = &initiatorname[0];
+
sess->se_sess = target_setup_session(se_tpg, TCM_FC_DEFAULT_TAGS,
sizeof(struct ft_cmd),
- TARGET_PROT_NORMAL, &initiatorname[0],
- sess, ft_sess_alloc_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ &initiatorname[0], sess,
+ ft_sess_alloc_cb);
if (IS_ERR(sess->se_sess)) {
int rc = PTR_ERR(sess->se_sess);
kfree(sess);
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 3650493..1157d68 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1564,6 +1564,7 @@ static int usbg_alloc_sess_cb(struct se_portal_group *se_tpg,
static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
{
struct tcm_usbg_nexus *tv_nexus;
+ struct t10_transport_id tpid;
int ret = 0;
mutex_lock(&tpg->tpg_mutex);
@@ -1579,11 +1580,16 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
goto out_unlock;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+ tpid.name = name;
+
tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg,
USB_G_DEFAULT_SESSION_TAGS,
sizeof(struct usbg_cmd),
- TARGET_PROT_NORMAL, name,
- tv_nexus, usbg_alloc_sess_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ name, tv_nexus,
+ usbg_alloc_sess_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
#define MAKE_NEXUS_MSG "core_tpg_check_initiator_node_acl() failed for %s\n"
pr_debug(MAKE_NEXUS_MSG, name);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 0b949a1..bd7875e 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1937,10 +1937,10 @@ static int vhost_scsi_nexus_cb(struct se_portal_group *se_tpg,
return -ENOMEM;
}
-static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
- const char *name)
+static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg, char *name)
{
struct vhost_scsi_nexus *tv_nexus;
+ struct t10_transport_id tpid;
mutex_lock(&tpg->tv_tpg_mutex);
if (tpg->tpg_nexus) {
@@ -1949,6 +1949,20 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
return -EEXIST;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tv_nexus = kzalloc(sizeof(*tv_nexus), GFP_KERNEL);
if (!tv_nexus) {
mutex_unlock(&tpg->tv_tpg_mutex);
@@ -1964,7 +1978,7 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
VHOST_SCSI_DEFAULT_TAGS,
sizeof(struct vhost_scsi_cmd),
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,
- (unsigned char *)name, tv_nexus,
+ &tpid, (unsigned char *)name, tv_nexus,
vhost_scsi_nexus_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
mutex_unlock(&tpg->tv_tpg_mutex);
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index ba0942e..ef685ed 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1507,10 +1507,10 @@ static int scsiback_alloc_sess_cb(struct se_portal_group *se_tpg,
return 0;
}
-static int scsiback_make_nexus(struct scsiback_tpg *tpg,
- const char *name)
+static int scsiback_make_nexus(struct scsiback_tpg *tpg, char *name)
{
struct scsiback_nexus *tv_nexus;
+ struct t10_transport_id tpid;
int ret = 0;
mutex_lock(&tpg->tv_tpg_mutex);
@@ -1520,6 +1520,20 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg,
goto out_unlock;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tv_nexus = kzalloc(sizeof(struct scsiback_nexus), GFP_KERNEL);
if (!tv_nexus) {
ret = -ENOMEM;
@@ -1529,8 +1543,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,
- tv_nexus, scsiback_alloc_sess_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ name, tv_nexus,
+ scsiback_alloc_sess_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
kfree(tv_nexus);
ret = -ENOMEM;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 1728e88..d4a588d 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -333,6 +333,17 @@ struct t10_wwn {
struct list_head t10_vpd_list;
};
+struct t10_transport_id {
+ /* The format=0 transport specific port id/name value. */
+ char *name;
+ /*
+ * If proto is iSCSI and it's using format=1, then this is set to the
+ * initiator session id string defined in spc4r37 table 508.
+ */
+ char *session_id;
+ u8 proto;
+};
+
struct t10_pr_registration {
/* Used for fabrics that contain WWN+ISID */
#define PR_REG_ISID_LEN 16
@@ -605,6 +616,7 @@ static inline struct se_node_acl *fabric_stat_to_nacl(struct config_item *item)
struct se_session {
unsigned sess_tearing_down:1;
u64 sess_bin_isid;
+ struct t10_transport_id *tpid;
enum target_prot_op sup_prot_ops;
enum target_prot_type sess_prot_type;
struct se_node_acl *se_node_acl;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 063f133..6b8a6bc 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -125,9 +125,10 @@ struct target_core_fabric_ops {
int target_depend_item(struct config_item *item);
void target_undepend_item(struct config_item *item);
+struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *);
struct se_session *target_setup_session(struct se_portal_group *,
unsigned int, unsigned int, enum target_prot_op prot_op,
- const char *, void *,
+ struct t10_transport_id *, const char *, void *,
int (*callback)(struct se_portal_group *,
struct se_session *, void *));
void target_remove_session(struct se_session *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 02/11] target: separate acl name from port ids
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
The PGR code assumes the ACL name is going to be based on the SPC4
transportID type of values. The problem is that for iSCSI we have an
extra session id as part of the SCSI port id and some fabric modules
support or would like to support non transportID values for the ACL
name. For example, iSCSI and SRP would like to use the source address
for the ACL name, but that is not a valud transportID value that you
can get in a PGR request.
This patch adds a new transport_id struct which maps to the SPC
transportID. In the future will be used for PGR commands instead of
the ACL name. In this patchset, it is used to export the initiator
info in the session's sysfs dir, so tools can disply the info and
daemons that execute commands like PGRs in userspace can build a
session id to I_T nexus mapping.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V3:
- drop format
drivers/infiniband/ulp/srpt/ib_srpt.c | 13 +++++++----
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 9 ++++++--
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 8 ++++++-
drivers/target/loopback/tcm_loop.c | 20 ++++++++++++++--
drivers/target/sbp/sbp_target.c | 9 ++++++--
drivers/target/target_core_fabric_lib.c | 39 ++++++++++++++++++++++++++++++++
drivers/target/target_core_internal.h | 1 +
drivers/target/target_core_transport.c | 26 ++++++++++++++-------
drivers/target/tcm_fc/tfc_sess.c | 10 ++++++--
drivers/usb/gadget/function/f_tcm.c | 10 ++++++--
drivers/vhost/scsi.c | 20 +++++++++++++---
drivers/xen/xen-scsiback.c | 23 +++++++++++++++----
include/target/target_core_base.h | 12 ++++++++++
include/target/target_core_fabric.h | 3 ++-
14 files changed, 172 insertions(+), 31 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 9855274..9952731 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2144,6 +2144,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
const char *src_addr)
{
struct srpt_port *sport = &sdev->port[port_num - 1];
+ struct t10_transport_id tpid;
struct srpt_nexus *nexus;
struct srp_login_rsp *rsp = NULL;
struct srp_login_rej *rej = NULL;
@@ -2314,13 +2315,17 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
tag_num = ch->rq_size;
tag_size = 1; /* ib_srpt does not use se_sess->sess_cmd_map */
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SRP;
+ tpid.name = i_port_id + 2;
+
mutex_lock(&sport->port_guid_id.mutex);
list_for_each_entry(stpg, &sport->port_guid_id.tpg_list, entry) {
if (!IS_ERR_OR_NULL(ch->sess))
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL,
- ch->sess_name, ch, NULL);
+ &tpid, ch->sess_name, ch, NULL);
}
mutex_unlock(&sport->port_guid_id.mutex);
@@ -2329,14 +2334,14 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
if (!IS_ERR_OR_NULL(ch->sess))
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
- tag_size, TARGET_PROT_NORMAL, i_port_id,
- ch, NULL);
+ tag_size, TARGET_PROT_NORMAL, &tpid,
+ i_port_id, ch, NULL);
if (!IS_ERR_OR_NULL(ch->sess))
break;
/* Retry without leading "0x" */
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL,
- i_port_id + 2, ch, NULL);
+ &tpid, i_port_id + 2, ch, NULL);
}
mutex_unlock(&sport->port_gid_id.mutex);
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index d9e94e8..20c750f 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -2208,6 +2208,7 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
{
char *name = tport->tport_name;
struct ibmvscsis_nexus *nexus;
+ struct t10_transport_id tpid;
struct scsi_info *vscsi = container_of(tport, struct scsi_info, tport);
int rc;
@@ -2222,9 +2223,13 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
return -ENOMEM;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SRP;
+ tpid.name = name;
+
nexus->se_sess = target_setup_session(&tport->se_tpg, 0, 0,
- TARGET_PROT_NORMAL, name, nexus,
- NULL);
+ TARGET_PROT_NORMAL, &tpid, name,
+ nexus, NULL);
if (IS_ERR(nexus->se_sess)) {
rc = PTR_ERR(nexus->se_sess);
goto transport_init_fail;
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index abe7f79..517c698 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1428,6 +1428,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
{
struct qla_hw_data *ha = vha->hw;
struct tcm_qla2xxx_lport *lport;
+ struct t10_transport_id tpid;
struct tcm_qla2xxx_tpg *tpg;
struct se_session *se_sess;
unsigned char port_name[36];
@@ -1454,13 +1455,18 @@ static int tcm_qla2xxx_check_initiator_node_acl(
*/
memset(&port_name, 0, 36);
snprintf(port_name, sizeof(port_name), "%8phC", fc_wwpn);
+
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_FCP;
+ tpid.name = port_name;
+
/*
* Locate our struct se_node_acl either from an explict NodeACL created
* via ConfigFS, or via running in TPG demo mode.
*/
se_sess = target_setup_session(&tpg->se_tpg, num_tags,
sizeof(struct qla_tgt_cmd),
- TARGET_PROT_ALL, port_name,
+ TARGET_PROT_ALL, &tpid, port_name,
qlat_sess, tcm_qla2xxx_session_cb);
if (IS_ERR(se_sess))
return PTR_ERR(se_sess);
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 3305b47..7ea0738 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -725,10 +725,11 @@ static int tcm_loop_alloc_sess_cb(struct se_portal_group *se_tpg,
static int tcm_loop_make_nexus(
struct tcm_loop_tpg *tl_tpg,
- const char *name)
+ char *name)
{
struct tcm_loop_hba *tl_hba = tl_tpg->tl_hba;
struct tcm_loop_nexus *tl_nexus;
+ struct t10_transport_id tpid;
int ret;
if (tl_tpg->tl_nexus) {
@@ -736,13 +737,28 @@ static int tcm_loop_make_nexus(
return -EEXIST;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tl_hba->tl_proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tl_nexus = kzalloc(sizeof(*tl_nexus), GFP_KERNEL);
if (!tl_nexus)
return -ENOMEM;
tl_nexus->se_sess = target_setup_session(&tl_tpg->tl_se_tpg, 0, 0,
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,
- name, tl_nexus, tcm_loop_alloc_sess_cb);
+ &tpid, name, tl_nexus,
+ tcm_loop_alloc_sess_cb);
if (IS_ERR(tl_nexus->se_sess)) {
ret = PTR_ERR(tl_nexus->se_sess);
kfree(tl_nexus);
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index e4a9b9f..0eb1072 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -181,6 +181,7 @@ static struct sbp_session *sbp_session_create(
struct sbp_tpg *tpg,
u64 guid)
{
+ struct t10_transport_id tpid;
struct sbp_session *sess;
int ret;
char guid_str[17];
@@ -196,10 +197,14 @@ static struct sbp_session *sbp_session_create(
INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work);
sess->guid = guid;
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_SBP;
+ tpid.name = guid_str;
+
sess->se_sess = target_setup_session(&tpg->se_tpg, 128,
sizeof(struct sbp_target_request),
- TARGET_PROT_NORMAL, guid_str,
- sess, NULL);
+ TARGET_PROT_NORMAL, &tpid,
+ guid_str, sess, NULL);
if (IS_ERR(sess->se_sess)) {
pr_err("failed to init se_session\n");
ret = PTR_ERR(sess->se_sess);
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index 6b4b354..03f9ece 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -421,3 +421,42 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
*out_tid_len = 24;
return buf + offset;
}
+
+struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *src)
+{
+ struct t10_transport_id *dst;
+
+ dst = kzalloc(sizeof(*dst), GFP_KERNEL);
+ if (!dst)
+ return NULL;
+ dst->proto = src->proto;
+
+ dst->name = kstrdup(src->name, GFP_KERNEL);
+ if (!dst->name)
+ goto free_tpid;
+
+ if (src->session_id) {
+ dst->session_id = kstrdup(src->session_id, GFP_KERNEL);
+ if (!dst->session_id)
+ goto free_name;
+ }
+
+ return dst;
+
+free_name:
+ kfree(dst->name);
+free_tpid:
+ kfree(dst);
+ return NULL;
+}
+EXPORT_SYMBOL(target_cp_transport_id);
+
+void target_free_transport_id(struct t10_transport_id *tpid)
+{
+ if (!tpid)
+ return;
+
+ kfree(tpid->name);
+ kfree(tpid->session_id);
+ kfree(tpid);
+}
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 8533444..5e016aa 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -104,6 +104,7 @@ int target_get_pr_transport_id(struct se_node_acl *nacl,
unsigned char *buf);
const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
char *buf, u32 *out_tid_len, char **port_nexus_ptr);
+void target_free_transport_id(struct t10_transport_id *tpid);
/* target_core_hba.c */
struct se_hba *core_alloc_hba(const char *, u32, u32);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 0ae9e60..7715a723 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -416,12 +416,13 @@ void transport_register_session(
struct se_session *
target_setup_session(struct se_portal_group *tpg,
unsigned int tag_num, unsigned int tag_size,
- enum target_prot_op prot_op,
+ enum target_prot_op prot_op, struct t10_transport_id *tpid,
const char *initiatorname, void *private,
int (*callback)(struct se_portal_group *,
struct se_session *, void *))
{
struct se_session *sess;
+ int rc;
/*
* If the fabric driver is using percpu-ida based pre allocation
@@ -435,26 +436,34 @@ struct se_session *
if (IS_ERR(sess))
return sess;
+ sess->tpid = target_cp_transport_id(tpid);
+ if (!sess->tpid) {
+ rc = -ENOMEM;
+ goto free_sess;
+ }
+
sess->se_node_acl = core_tpg_check_initiator_node_acl(tpg,
(unsigned char *)initiatorname);
if (!sess->se_node_acl) {
- transport_free_session(sess);
- return ERR_PTR(-EACCES);
+ rc = -EACCES;
+ goto free_sess;
}
/*
* Go ahead and perform any remaining fabric setup that is
* required before transport_register_session().
*/
if (callback != NULL) {
- int rc = callback(tpg, sess, private);
- if (rc) {
- transport_free_session(sess);
- return ERR_PTR(rc);
- }
+ rc = callback(tpg, sess, private);
+ if (rc)
+ goto free_sess;
}
transport_register_session(tpg, sess->se_node_acl, sess, private);
return sess;
+
+free_sess:
+ transport_free_session(sess);
+ return ERR_PTR(rc);
}
EXPORT_SYMBOL(target_setup_session);
@@ -579,6 +588,7 @@ void transport_free_session(struct se_session *se_sess)
sbitmap_queue_free(&se_sess->sess_tag_pool);
kvfree(se_sess->sess_cmd_map);
}
+ target_free_transport_id(se_sess->tpid);
percpu_ref_exit(&se_sess->cmd_count);
kmem_cache_free(se_sess_cache, se_sess);
}
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 4fd6a1d..6e172ff 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -208,6 +208,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
struct fc_rport_priv *rdata)
{
struct se_portal_group *se_tpg = &tport->tpg->se_tpg;
+ struct t10_transport_id tpid;
struct ft_sess *sess;
struct hlist_head *head;
unsigned char initiatorname[TRANSPORT_IQN_LEN];
@@ -227,10 +228,15 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
sess->tport = tport;
sess->port_id = port_id;
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = SCSI_PROTOCOL_FCP;
+ tpid.name = &initiatorname[0];
+
sess->se_sess = target_setup_session(se_tpg, TCM_FC_DEFAULT_TAGS,
sizeof(struct ft_cmd),
- TARGET_PROT_NORMAL, &initiatorname[0],
- sess, ft_sess_alloc_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ &initiatorname[0], sess,
+ ft_sess_alloc_cb);
if (IS_ERR(sess->se_sess)) {
int rc = PTR_ERR(sess->se_sess);
kfree(sess);
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 3650493..1157d68 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1564,6 +1564,7 @@ static int usbg_alloc_sess_cb(struct se_portal_group *se_tpg,
static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
{
struct tcm_usbg_nexus *tv_nexus;
+ struct t10_transport_id tpid;
int ret = 0;
mutex_lock(&tpg->tpg_mutex);
@@ -1579,11 +1580,16 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
goto out_unlock;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+ tpid.name = name;
+
tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg,
USB_G_DEFAULT_SESSION_TAGS,
sizeof(struct usbg_cmd),
- TARGET_PROT_NORMAL, name,
- tv_nexus, usbg_alloc_sess_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ name, tv_nexus,
+ usbg_alloc_sess_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
#define MAKE_NEXUS_MSG "core_tpg_check_initiator_node_acl() failed for %s\n"
pr_debug(MAKE_NEXUS_MSG, name);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 0b949a1..bd7875e 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1937,10 +1937,10 @@ static int vhost_scsi_nexus_cb(struct se_portal_group *se_tpg,
return -ENOMEM;
}
-static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
- const char *name)
+static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg, char *name)
{
struct vhost_scsi_nexus *tv_nexus;
+ struct t10_transport_id tpid;
mutex_lock(&tpg->tv_tpg_mutex);
if (tpg->tpg_nexus) {
@@ -1949,6 +1949,20 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
return -EEXIST;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tv_nexus = kzalloc(sizeof(*tv_nexus), GFP_KERNEL);
if (!tv_nexus) {
mutex_unlock(&tpg->tv_tpg_mutex);
@@ -1964,7 +1978,7 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
VHOST_SCSI_DEFAULT_TAGS,
sizeof(struct vhost_scsi_cmd),
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,
- (unsigned char *)name, tv_nexus,
+ &tpid, (unsigned char *)name, tv_nexus,
vhost_scsi_nexus_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
mutex_unlock(&tpg->tv_tpg_mutex);
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index ba0942e..ef685ed 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1507,10 +1507,10 @@ static int scsiback_alloc_sess_cb(struct se_portal_group *se_tpg,
return 0;
}
-static int scsiback_make_nexus(struct scsiback_tpg *tpg,
- const char *name)
+static int scsiback_make_nexus(struct scsiback_tpg *tpg, char *name)
{
struct scsiback_nexus *tv_nexus;
+ struct t10_transport_id tpid;
int ret = 0;
mutex_lock(&tpg->tv_tpg_mutex);
@@ -1520,6 +1520,20 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg,
goto out_unlock;
}
+ memset(&tpid, 0, sizeof(tpid));
+ tpid.proto = tpg->se_tpg.proto_id;
+
+ if (tpid.proto == SCSI_PROTOCOL_SAS) {
+ /* Drop naa. prefix */
+ tpid.name = name + 4;
+ } else {
+ /*
+ * For iSCSI we only support format=0, so we always only set
+ * the name
+ */
+ tpid.name = name;
+ }
+
tv_nexus = kzalloc(sizeof(struct scsiback_nexus), GFP_KERNEL);
if (!tv_nexus) {
ret = -ENOMEM;
@@ -1529,8 +1543,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,
- tv_nexus, scsiback_alloc_sess_cb);
+ TARGET_PROT_NORMAL, &tpid,
+ name, tv_nexus,
+ scsiback_alloc_sess_cb);
if (IS_ERR(tv_nexus->tvn_se_sess)) {
kfree(tv_nexus);
ret = -ENOMEM;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 1728e88..d4a588d 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -333,6 +333,17 @@ struct t10_wwn {
struct list_head t10_vpd_list;
};
+struct t10_transport_id {
+ /* The format=0 transport specific port id/name value. */
+ char *name;
+ /*
+ * If proto is iSCSI and it's using format=1, then this is set to the
+ * initiator session id string defined in spc4r37 table 508.
+ */
+ char *session_id;
+ u8 proto;
+};
+
struct t10_pr_registration {
/* Used for fabrics that contain WWN+ISID */
#define PR_REG_ISID_LEN 16
@@ -605,6 +616,7 @@ static inline struct se_node_acl *fabric_stat_to_nacl(struct config_item *item)
struct se_session {
unsigned sess_tearing_down:1;
u64 sess_bin_isid;
+ struct t10_transport_id *tpid;
enum target_prot_op sup_prot_ops;
enum target_prot_type sess_prot_type;
struct se_node_acl *se_node_acl;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 063f133..6b8a6bc 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -125,9 +125,10 @@ struct target_core_fabric_ops {
int target_depend_item(struct config_item *item);
void target_undepend_item(struct config_item *item);
+struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *);
struct se_session *target_setup_session(struct se_portal_group *,
unsigned int, unsigned int, enum target_prot_op prot_op,
- const char *, void *,
+ struct t10_transport_id *, const char *, void *,
int (*callback)(struct se_portal_group *,
struct se_session *, void *));
void target_remove_session(struct se_session *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 03/11] iscsi target: setup transport_id
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 03/11] iscsi target: setup transport_id
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 04/11] target: use tpid in target_stat_iport_port_ident_show
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Use the tpid session id instead of sess_get_initiator_sid.
Note that for userspace compat this patch continues the behavior:
1. Still add the "+i+" even if there is no session_id.
2. Use the acl initiatorname instead of the transportID port/addr/name.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_stat.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index 237309d..69ba7c3 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -1308,9 +1308,7 @@ static ssize_t target_stat_iport_port_ident_show(struct config_item *item,
struct se_lun_acl *lacl = iport_to_lacl(item);
struct se_node_acl *nacl = lacl->se_lun_nacl;
struct se_session *se_sess;
- struct se_portal_group *tpg;
ssize_t ret;
- unsigned char buf[64];
spin_lock_irq(&nacl->nacl_sess_lock);
se_sess = nacl->nacl_sess;
@@ -1319,13 +1317,9 @@ static ssize_t target_stat_iport_port_ident_show(struct config_item *item,
return -ENODEV;
}
- tpg = nacl->se_tpg;
- /* scsiAttIntrPortName+scsiAttIntrPortIdentifier */
- memset(buf, 0, 64);
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL)
- tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess, buf, 64);
-
- ret = snprintf(page, PAGE_SIZE, "%s+i+%s\n", nacl->initiatorname, buf);
+ ret = snprintf(page, PAGE_SIZE, "%s+i+%s\n", nacl->initiatorname,
+ se_sess->tpid->session_id ? se_sess->tpid->session_id :
+ "");
spin_unlock_irq(&nacl->nacl_sess_lock);
return ret;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 04/11] target: use tpid in target_stat_iport_port_ident_show
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Use the tpid session id instead of sess_get_initiator_sid.
Note that for userspace compat this patch continues the behavior:
1. Still add the "+i+" even if there is no session_id.
2. Use the acl initiatorname instead of the transportID port/addr/name.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_stat.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index 237309d..69ba7c3 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -1308,9 +1308,7 @@ static ssize_t target_stat_iport_port_ident_show(struct config_item *item,
struct se_lun_acl *lacl = iport_to_lacl(item);
struct se_node_acl *nacl = lacl->se_lun_nacl;
struct se_session *se_sess;
- struct se_portal_group *tpg;
ssize_t ret;
- unsigned char buf[64];
spin_lock_irq(&nacl->nacl_sess_lock);
se_sess = nacl->nacl_sess;
@@ -1319,13 +1317,9 @@ static ssize_t target_stat_iport_port_ident_show(struct config_item *item,
return -ENODEV;
}
- tpg = nacl->se_tpg;
- /* scsiAttIntrPortName+scsiAttIntrPortIdentifier */
- memset(buf, 0, 64);
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL)
- tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess, buf, 64);
-
- ret = snprintf(page, PAGE_SIZE, "%s+i+%s\n", nacl->initiatorname, buf);
+ ret = snprintf(page, PAGE_SIZE, "%s+i+%s\n", nacl->initiatorname,
+ se_sess->tpid->session_id ? se_sess->tpid->session_id :
+ "");
spin_unlock_irq(&nacl->nacl_sess_lock);
return ret;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 05/11] target: drop sess_get_initiator_sid from PR code
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Use the transport id session id in the PR related code.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_pr.c | 23 ++++-------------------
drivers/target/target_core_transport.c | 11 ++++-------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index cd2d32f..e80bd88 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -1204,17 +1204,7 @@ static struct t10_pr_registration *core_scsi3_locate_pr_reg(
struct se_node_acl *nacl,
struct se_session *sess)
{
- struct se_portal_group *tpg = nacl->se_tpg;
- unsigned char buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
-
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- memset(&buf[0], 0, PR_REG_ISID_LEN);
- tpg->se_tpg_tfo->sess_get_initiator_sid(sess, &buf[0],
- PR_REG_ISID_LEN);
- isid_ptr = &buf[0];
- }
-
- return __core_scsi3_locate_pr_reg(dev, nacl, isid_ptr);
+ return __core_scsi3_locate_pr_reg(dev, nacl, sess->tpid->session_id);
}
static void core_scsi3_put_pr_reg(struct t10_pr_registration *pr_reg)
@@ -1592,7 +1582,7 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve)
* SCSI Intiatior TransportID w/ ISIDs is enforced
* for fabric modules (iSCSI) requiring them.
*/
- if (tpg->se_tpg_tfo->sess_get_initiator_sid &&
+ if (se_sess->tpid->session_id &&
dev->dev_attrib.enforce_pr_isids &&
!iport_ptr) {
pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.",
@@ -2057,7 +2047,7 @@ static sense_reason_t core_scsi3_update_and_write_aptpl(struct se_device *dev, b
struct se_portal_group *se_tpg;
struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_reg_tmp;
struct t10_reservation *pr_tmpl = &dev->t10_pr;
- unsigned char isid_buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
+ unsigned char *isid_ptr = NULL;
sense_reason_t ret = TCM_NO_SENSE;
int pr_holder = 0, type;
@@ -2067,12 +2057,7 @@ static sense_reason_t core_scsi3_update_and_write_aptpl(struct se_device *dev, b
}
se_tpg = se_sess->se_tpg;
- if (se_tpg->se_tpg_tfo->sess_get_initiator_sid) {
- memset(&isid_buf[0], 0, PR_REG_ISID_LEN);
- se_tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess, &isid_buf[0],
- PR_REG_ISID_LEN);
- isid_ptr = &isid_buf[0];
- }
+ isid_ptr = se_sess->tpid->session_id;
/*
* Follow logic from spc4r17 Section 5.7.7, Register Behaviors Table 47
*/
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 7715a723..369cd7e 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -343,7 +343,7 @@ void __transport_register_session(
void *fabric_sess_ptr)
{
const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;
- unsigned char buf[PR_REG_ISID_LEN];
+ unsigned char *sid;
unsigned long flags;
se_sess->se_tpg = se_tpg;
@@ -374,12 +374,9 @@ void __transport_register_session(
* If the fabric module supports an ISID based TransportID,
* save this value in binary from the fabric I_T Nexus now.
*/
- if (se_tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- memset(&buf[0], 0, PR_REG_ISID_LEN);
- se_tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess,
- &buf[0], PR_REG_ISID_LEN);
- se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]);
- }
+ sid = se_sess->tpid->session_id;
+ if (sid)
+ se_sess->sess_bin_isid = get_unaligned_be64(sid);
spin_lock_irqsave(&se_nacl->nacl_sess_lock, flags);
/*
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 05/11] target: drop sess_get_initiator_sid from PR code
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
Use the transport id session id in the PR related code.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_pr.c | 23 ++++-------------------
drivers/target/target_core_transport.c | 11 ++++-------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index cd2d32f..e80bd88 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -1204,17 +1204,7 @@ static struct t10_pr_registration *core_scsi3_locate_pr_reg(
struct se_node_acl *nacl,
struct se_session *sess)
{
- struct se_portal_group *tpg = nacl->se_tpg;
- unsigned char buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
-
- if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- memset(&buf[0], 0, PR_REG_ISID_LEN);
- tpg->se_tpg_tfo->sess_get_initiator_sid(sess, &buf[0],
- PR_REG_ISID_LEN);
- isid_ptr = &buf[0];
- }
-
- return __core_scsi3_locate_pr_reg(dev, nacl, isid_ptr);
+ return __core_scsi3_locate_pr_reg(dev, nacl, sess->tpid->session_id);
}
static void core_scsi3_put_pr_reg(struct t10_pr_registration *pr_reg)
@@ -1592,7 +1582,7 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve)
* SCSI Intiatior TransportID w/ ISIDs is enforced
* for fabric modules (iSCSI) requiring them.
*/
- if (tpg->se_tpg_tfo->sess_get_initiator_sid &&
+ if (se_sess->tpid->session_id &&
dev->dev_attrib.enforce_pr_isids &&
!iport_ptr) {
pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.",
@@ -2057,7 +2047,7 @@ static sense_reason_t core_scsi3_update_and_write_aptpl(struct se_device *dev, b
struct se_portal_group *se_tpg;
struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_reg_tmp;
struct t10_reservation *pr_tmpl = &dev->t10_pr;
- unsigned char isid_buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
+ unsigned char *isid_ptr = NULL;
sense_reason_t ret = TCM_NO_SENSE;
int pr_holder = 0, type;
@@ -2067,12 +2057,7 @@ static sense_reason_t core_scsi3_update_and_write_aptpl(struct se_device *dev, b
}
se_tpg = se_sess->se_tpg;
- if (se_tpg->se_tpg_tfo->sess_get_initiator_sid) {
- memset(&isid_buf[0], 0, PR_REG_ISID_LEN);
- se_tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess, &isid_buf[0],
- PR_REG_ISID_LEN);
- isid_ptr = &isid_buf[0];
- }
+ isid_ptr = se_sess->tpid->session_id;
/*
* Follow logic from spc4r17 Section 5.7.7, Register Behaviors Table 47
*/
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 7715a723..369cd7e 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -343,7 +343,7 @@ void __transport_register_session(
void *fabric_sess_ptr)
{
const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;
- unsigned char buf[PR_REG_ISID_LEN];
+ unsigned char *sid;
unsigned long flags;
se_sess->se_tpg = se_tpg;
@@ -374,12 +374,9 @@ void __transport_register_session(
* If the fabric module supports an ISID based TransportID,
* save this value in binary from the fabric I_T Nexus now.
*/
- if (se_tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) {
- memset(&buf[0], 0, PR_REG_ISID_LEN);
- se_tpg->se_tpg_tfo->sess_get_initiator_sid(se_sess,
- &buf[0], PR_REG_ISID_LEN);
- se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]);
- }
+ sid = se_sess->tpid->session_id;
+ if (sid)
+ se_sess->sess_bin_isid = get_unaligned_be64(sid);
spin_lock_irqsave(&se_nacl->nacl_sess_lock, flags);
/*
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 06/11] target: drop sess_get_initiator_sid
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
sess_get_initiator_sid is no longer used. Drop it.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 1 -
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 --
drivers/target/iscsi/iscsi_target_configfs.c | 13 -------------
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/usb/gadget/function/f_tcm.c | 1 -
drivers/vhost/scsi.c | 1 -
drivers/xen/xen-scsiback.c | 1 -
include/target/target_core_fabric.h | 6 ------
8 files changed, 26 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 9952731..10b6a02 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3847,7 +3847,6 @@ static ssize_t srpt_wwn_version_show(struct config_item *item, char *buf)
.check_stop_free = srpt_check_stop_free,
.close_session = srpt_close_session,
.sess_get_index = srpt_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = srpt_write_pending,
.set_default_node_attributes = srpt_set_default_node_attrs,
.get_cmd_state = srpt_get_tcm_cmd_state,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 517c698..43fcf81 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1833,7 +1833,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
.sess_get_index = tcm_qla2xxx_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
@@ -1873,7 +1872,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
.sess_get_index = tcm_qla2xxx_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 42b369f..f640e7a 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1349,18 +1349,6 @@ static u32 lio_sess_get_index(struct se_session *se_sess)
return sess->session_index;
}
-static u32 lio_sess_get_initiator_sid(
- struct se_session *se_sess,
- unsigned char *buf,
- u32 size)
-{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
- /*
- * iSCSI Initiator Session Identifier from RFC-3720.
- */
- return snprintf(buf, size, "%6phN", sess->isid);
-}
-
static int lio_queue_data_in(struct se_cmd *se_cmd)
{
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1542,7 +1530,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
.release_cmd = lio_release_cmd,
.close_session = lio_tpg_close_session,
.sess_get_index = lio_sess_get_index,
- .sess_get_initiator_sid = lio_sess_get_initiator_sid,
.write_pending = lio_write_pending,
.set_default_node_attributes = lio_set_default_node_attributes,
.get_cmd_state = iscsi_get_cmd_state,
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 1a38c98..870b7bb 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -427,7 +427,6 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
.release_cmd = ft_release_cmd,
.close_session = ft_sess_close,
.sess_get_index = ft_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = ft_write_pending,
.set_default_node_attributes = ft_set_default_node_attr,
.get_cmd_state = ft_get_cmd_state,
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 1157d68..e6d7232 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1721,7 +1721,6 @@ static int usbg_check_stop_free(struct se_cmd *se_cmd)
.tpg_get_inst_index = usbg_tpg_get_inst_index,
.release_cmd = usbg_release_cmd,
.sess_get_index = usbg_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = usbg_send_write_request,
.set_default_node_attributes = usbg_set_default_node_attrs,
.get_cmd_state = usbg_get_cmd_state,
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index bd7875e..182d2ea 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -2305,7 +2305,6 @@ static void vhost_scsi_drop_tport(struct se_wwn *wwn)
.release_cmd = vhost_scsi_release_cmd,
.check_stop_free = vhost_scsi_check_stop_free,
.sess_get_index = vhost_scsi_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = vhost_scsi_write_pending,
.set_default_node_attributes = vhost_scsi_set_default_node_attrs,
.get_cmd_state = vhost_scsi_get_cmd_state,
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index ef685ed..67b4092 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1826,7 +1826,6 @@ static int scsiback_check_false(struct se_portal_group *se_tpg)
.check_stop_free = scsiback_check_stop_free,
.release_cmd = scsiback_release_cmd,
.sess_get_index = scsiback_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = scsiback_write_pending,
.set_default_node_attributes = scsiback_set_default_node_attrs,
.get_cmd_state = scsiback_get_cmd_state,
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 6b8a6bc..0c1720d 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -67,12 +67,6 @@ struct target_core_fabric_ops {
void (*release_cmd)(struct se_cmd *);
void (*close_session)(struct se_session *);
u32 (*sess_get_index)(struct se_session *);
- /*
- * Used only for SCSI fabrics that contain multi-value TransportIDs
- * (like iSCSI). All other SCSI fabrics should set this to NULL.
- */
- u32 (*sess_get_initiator_sid)(struct se_session *,
- unsigned char *, u32);
int (*write_pending)(struct se_cmd *);
void (*set_default_node_attributes)(struct se_node_acl *);
int (*get_cmd_state)(struct se_cmd *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 06/11] target: drop sess_get_initiator_sid
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
sess_get_initiator_sid is no longer used. Drop it.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 1 -
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 --
drivers/target/iscsi/iscsi_target_configfs.c | 13 -------------
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/usb/gadget/function/f_tcm.c | 1 -
drivers/vhost/scsi.c | 1 -
drivers/xen/xen-scsiback.c | 1 -
include/target/target_core_fabric.h | 6 ------
8 files changed, 26 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 9952731..10b6a02 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3847,7 +3847,6 @@ static ssize_t srpt_wwn_version_show(struct config_item *item, char *buf)
.check_stop_free = srpt_check_stop_free,
.close_session = srpt_close_session,
.sess_get_index = srpt_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = srpt_write_pending,
.set_default_node_attributes = srpt_set_default_node_attrs,
.get_cmd_state = srpt_get_tcm_cmd_state,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 517c698..43fcf81 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1833,7 +1833,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
.sess_get_index = tcm_qla2xxx_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
@@ -1873,7 +1872,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
.sess_get_index = tcm_qla2xxx_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 42b369f..f640e7a 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1349,18 +1349,6 @@ static u32 lio_sess_get_index(struct se_session *se_sess)
return sess->session_index;
}
-static u32 lio_sess_get_initiator_sid(
- struct se_session *se_sess,
- unsigned char *buf,
- u32 size)
-{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
- /*
- * iSCSI Initiator Session Identifier from RFC-3720.
- */
- return snprintf(buf, size, "%6phN", sess->isid);
-}
-
static int lio_queue_data_in(struct se_cmd *se_cmd)
{
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1542,7 +1530,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
.release_cmd = lio_release_cmd,
.close_session = lio_tpg_close_session,
.sess_get_index = lio_sess_get_index,
- .sess_get_initiator_sid = lio_sess_get_initiator_sid,
.write_pending = lio_write_pending,
.set_default_node_attributes = lio_set_default_node_attributes,
.get_cmd_state = iscsi_get_cmd_state,
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 1a38c98..870b7bb 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -427,7 +427,6 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
.release_cmd = ft_release_cmd,
.close_session = ft_sess_close,
.sess_get_index = ft_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = ft_write_pending,
.set_default_node_attributes = ft_set_default_node_attr,
.get_cmd_state = ft_get_cmd_state,
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 1157d68..e6d7232 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1721,7 +1721,6 @@ static int usbg_check_stop_free(struct se_cmd *se_cmd)
.tpg_get_inst_index = usbg_tpg_get_inst_index,
.release_cmd = usbg_release_cmd,
.sess_get_index = usbg_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = usbg_send_write_request,
.set_default_node_attributes = usbg_set_default_node_attrs,
.get_cmd_state = usbg_get_cmd_state,
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index bd7875e..182d2ea 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -2305,7 +2305,6 @@ static void vhost_scsi_drop_tport(struct se_wwn *wwn)
.release_cmd = vhost_scsi_release_cmd,
.check_stop_free = vhost_scsi_check_stop_free,
.sess_get_index = vhost_scsi_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = vhost_scsi_write_pending,
.set_default_node_attributes = vhost_scsi_set_default_node_attrs,
.get_cmd_state = vhost_scsi_get_cmd_state,
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index ef685ed..67b4092 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1826,7 +1826,6 @@ static int scsiback_check_false(struct se_portal_group *se_tpg)
.check_stop_free = scsiback_check_stop_free,
.release_cmd = scsiback_release_cmd,
.sess_get_index = scsiback_sess_get_index,
- .sess_get_initiator_sid = NULL,
.write_pending = scsiback_write_pending,
.set_default_node_attributes = scsiback_set_default_node_attrs,
.get_cmd_state = scsiback_get_cmd_state,
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 6b8a6bc..0c1720d 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -67,12 +67,6 @@ struct target_core_fabric_ops {
void (*release_cmd)(struct se_cmd *);
void (*close_session)(struct se_session *);
u32 (*sess_get_index)(struct se_session *);
- /*
- * Used only for SCSI fabrics that contain multi-value TransportIDs
- * (like iSCSI). All other SCSI fabrics should set this to NULL.
- */
- u32 (*sess_get_initiator_sid)(struct se_session *,
- unsigned char *, u32);
int (*write_pending)(struct se_cmd *);
void (*set_default_node_attributes)(struct se_node_acl *);
int (*get_cmd_state)(struct se_cmd *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 07/11] target: add sysfs support
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
configfs does not work well when the kernel is initiating the creation
of an object we want to export info for and the objects above/below it
are created by the user. There are races/bugs like seen with this patch
and the issue the original bug was trying to fix:
commit f19e4ed1e1edbfa3c9ccb9fed17759b7d6db24c6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Aug 29 23:13:30 2019 -0400
configfs_register_group() shouldn't be (and isn't) called in
rmdirable parts
The problem is that for many drivers like qla2xxx, iscsi, etc, session
creation is done by the kernel when there is a login initiated by an
initiator, but we need a common way to export the systems sessions so
tools like targetcli can report basic info like what initaitors are
logged in and daemons like tcmu-runner can track sessions for load
balancing and PGRs.
This patch begins to add a sysfs interface that will initially be used
to export LIO's sessions. The general layout will mirror the lio
configfs tree:
scsi_target/
├── $fabric_driver
│ └── $target_name
│ ├── tpgt_1
│ │ └── sessions
│ └── tpgt_2
│ └── sessions
└── sessions
iscsi example:
scsi_target/
├── iscsi
│ └── iqn.1999-09.com.tcmu:ceph
│ ├── tpgt_1
│ │ └── sessions
│ └── tpgt_2
│ └── sessions
└── sessions
This initial patch adds only adds the upper layer dirs above the
sessions.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V2:
- rename top level dir to scsi_target
V3:
- delay tpg deletion to allow fabric modules time to remove their
sessions.
- Added root sessions dir for easier lookup if userspace has the
session id.
drivers/target/target_core_configfs.c | 30 +++++++++++++++++++++
drivers/target/target_core_fabric_configfs.c | 40 ++++++++++++++++++++++++++++
drivers/target/target_core_internal.h | 1 +
include/target/target_core_base.h | 4 +++
4 files changed, 75 insertions(+)
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index e6e1755..20aa58b 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -63,6 +63,9 @@
pr_debug("Setup generic %s\n", __stringify(_name)); \
}
+static struct kobject *tcm_core_kobj;
+static struct kobject *tcm_core_sessions_kobj;
+
extern struct t10_alua_lu_gp *default_lu_gp;
static LIST_HEAD(g_tf_list);
@@ -245,6 +248,11 @@ static struct config_group *target_core_register_fabric(
}
pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:"
" %s\n", tf->tf_ops->fabric_name);
+
+ tf->kobj = kobject_create_and_add(name, tcm_core_kobj);
+ if (!tf->kobj)
+ goto dec_tf;
+
/*
* On a successful target_core_get_fabric() look, the returned
* struct target_fabric_configfs *tf will contain a usage reference.
@@ -261,6 +269,10 @@ static struct config_group *target_core_register_fabric(
pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric: %s\n",
config_item_name(&tf->tf_group.cg_item));
return &tf->tf_group;
+
+dec_tf:
+ atomic_dec(&tf->tf_access_cnt);
+ return ERR_PTR(-EINVAL);
}
/*
@@ -283,6 +295,9 @@ static void target_core_deregister_fabric(
pr_debug("Target_Core_ConfigFS: DEREGISTER -> Releasing ci"
" %s\n", config_item_name(item));
+ kobject_del(tf->kobj);
+ kobject_put(tf->kobj);
+
configfs_remove_default_groups(&tf->tf_group);
config_item_put(item);
}
@@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
target_init_dbroot();
+ tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
+ if (!tcm_core_kobj)
+ goto out;
+
+ tcm_core_sessions_kobj = kobject_create_and_add("sessions",
+ tcm_core_kobj);
+ if (!tcm_core_sessions_kobj)
+ goto out;
+
return 0;
out:
@@ -3553,6 +3577,12 @@ static int __init target_core_init_configfs(void)
static void __exit target_core_exit_configfs(void)
{
+ kobject_del(tcm_core_sessions_kobj);
+ kobject_put(tcm_core_sessions_kobj);
+
+ kobject_del(tcm_core_kobj);
+ kobject_put(tcm_core_kobj);
+
configfs_remove_default_groups(&alua_lu_gps_group);
configfs_remove_default_groups(&alua_group);
configfs_remove_default_groups(&target_core_hbagroup);
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index ee85602..efa01b3 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -807,8 +807,23 @@ static void target_fabric_tpg_release(struct config_item *item)
struct se_portal_group, tpg_group);
struct se_wwn *wwn = se_tpg->se_tpg_wwn;
struct target_fabric_configfs *tf = wwn->wwn_tf;
+ struct kobject *sess_kobj, *tpg_kobj;
+
+ /*
+ * Some fabric modules remove the session from the drop_tpg
+ * callout, so remove these parent dirs until after the session
+ * is removed.
+ */
+ sess_kobj = se_tpg->sessions_kobj;
+ tpg_kobj = se_tpg->kobj;
tf->tf_ops->fabric_drop_tpg(se_tpg);
+
+ kobject_del(sess_kobj);
+ kobject_put(sess_kobj);
+
+ kobject_del(tpg_kobj);
+ kobject_put(tpg_kobj);
}
static struct configfs_item_operations target_fabric_tpg_base_item_ops = {
@@ -838,6 +853,14 @@ static struct config_group *target_fabric_make_tpg(
if (!se_tpg || IS_ERR(se_tpg))
return ERR_PTR(-EINVAL);
+ se_tpg->kobj = kobject_create_and_add(name, wwn->kobj);
+ if (!se_tpg->kobj)
+ goto drop_tpg;
+
+ se_tpg->sessions_kobj = kobject_create_and_add("sessions", se_tpg->kobj);
+ if (!se_tpg->sessions_kobj)
+ goto del_tpg_kobj;
+
config_group_init_type_name(&se_tpg->tpg_group, name,
&tf->tf_tpg_base_cit);
@@ -872,6 +895,13 @@ static struct config_group *target_fabric_make_tpg(
&se_tpg->tpg_group);
return &se_tpg->tpg_group;
+
+del_tpg_kobj:
+ kobject_del(se_tpg->kobj);
+ kobject_put(se_tpg->kobj);
+drop_tpg:
+ tf->tf_ops->fabric_drop_tpg(se_tpg);
+ return ERR_PTR(-EINVAL);
}
static void target_fabric_drop_tpg(
@@ -927,6 +957,7 @@ static struct config_group *target_fabric_make_wwn(
struct target_fabric_configfs *tf = container_of(group,
struct target_fabric_configfs, tf_group);
struct se_wwn *wwn;
+ int ret;
if (!tf->tf_ops->fabric_make_wwn) {
pr_err("tf->tf_ops.fabric_make_wwn is NULL\n");
@@ -938,6 +969,9 @@ static struct config_group *target_fabric_make_wwn(
return ERR_PTR(-EINVAL);
wwn->wwn_tf = tf;
+ wwn->kobj = kobject_create_and_add(name, tf->kobj);
+ if (!wwn->kobj)
+ goto drop_wwn;
config_group_init_type_name(&wwn->wwn_group, name, &tf->tf_tpg_cit);
@@ -948,6 +982,10 @@ static struct config_group *target_fabric_make_wwn(
if (tf->tf_ops->add_wwn_groups)
tf->tf_ops->add_wwn_groups(wwn);
return &wwn->wwn_group;
+
+drop_wwn:
+ tf->tf_ops->fabric_drop_wwn(wwn);
+ return ERR_PTR(ret);
}
static void target_fabric_drop_wwn(
@@ -957,6 +995,8 @@ static void target_fabric_drop_wwn(
struct se_wwn *wwn = container_of(to_config_group(item),
struct se_wwn, wwn_group);
+ kobject_del(wwn->kobj);
+ kobject_put(wwn->kobj);
configfs_remove_default_groups(&wwn->wwn_group);
config_item_put(item);
}
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 5e016aa..aea50f1 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -27,6 +27,7 @@ struct target_backend {
struct target_fabric_configfs {
atomic_t tf_access_cnt;
struct list_head tf_list;
+ struct kobject *kobj;
struct config_group tf_group;
struct config_group tf_disc_group;
const struct target_core_fabric_ops *tf_ops;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index d4a588d..16d2a4c 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -8,6 +8,7 @@
#include <linux/percpu-refcount.h>
#include <linux/semaphore.h> /* struct semaphore */
#include <linux/completion.h>
+#include <linux/kobject.h>
#define TARGET_CORE_VERSION "v5.0"
@@ -897,6 +898,8 @@ struct se_portal_group {
/* Pointer to $FABRIC_MOD dependent code */
const struct target_core_fabric_ops *se_tpg_tfo;
struct se_wwn *se_tpg_wwn;
+ struct kobject *kobj;
+ struct kobject *sessions_kobj;
struct config_group tpg_group;
struct config_group tpg_lun_group;
struct config_group tpg_np_group;
@@ -935,6 +938,7 @@ struct se_wwn {
void *priv;
struct config_group wwn_group;
struct config_group fabric_stat_group;
+ struct kobject *kobj;
};
static inline void atomic_inc_mb(atomic_t *v)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 07/11] target: add sysfs support
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
configfs does not work well when the kernel is initiating the creation
of an object we want to export info for and the objects above/below it
are created by the user. There are races/bugs like seen with this patch
and the issue the original bug was trying to fix:
commit f19e4ed1e1edbfa3c9ccb9fed17759b7d6db24c6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Aug 29 23:13:30 2019 -0400
configfs_register_group() shouldn't be (and isn't) called in
rmdirable parts
The problem is that for many drivers like qla2xxx, iscsi, etc, session
creation is done by the kernel when there is a login initiated by an
initiator, but we need a common way to export the systems sessions so
tools like targetcli can report basic info like what initaitors are
logged in and daemons like tcmu-runner can track sessions for load
balancing and PGRs.
This patch begins to add a sysfs interface that will initially be used
to export LIO's sessions. The general layout will mirror the lio
configfs tree:
scsi_target/
├── $fabric_driver
│ └── $target_name
│ ├── tpgt_1
│ │ └── sessions
│ └── tpgt_2
│ └── sessions
└── sessions
iscsi example:
scsi_target/
├── iscsi
│ └── iqn.1999-09.com.tcmu:ceph
│ ├── tpgt_1
│ │ └── sessions
│ └── tpgt_2
│ └── sessions
└── sessions
This initial patch adds only adds the upper layer dirs above the
sessions.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V2:
- rename top level dir to scsi_target
V3:
- delay tpg deletion to allow fabric modules time to remove their
sessions.
- Added root sessions dir for easier lookup if userspace has the
session id.
drivers/target/target_core_configfs.c | 30 +++++++++++++++++++++
drivers/target/target_core_fabric_configfs.c | 40 ++++++++++++++++++++++++++++
drivers/target/target_core_internal.h | 1 +
include/target/target_core_base.h | 4 +++
4 files changed, 75 insertions(+)
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index e6e1755..20aa58b 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -63,6 +63,9 @@
pr_debug("Setup generic %s\n", __stringify(_name)); \
}
+static struct kobject *tcm_core_kobj;
+static struct kobject *tcm_core_sessions_kobj;
+
extern struct t10_alua_lu_gp *default_lu_gp;
static LIST_HEAD(g_tf_list);
@@ -245,6 +248,11 @@ static struct config_group *target_core_register_fabric(
}
pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:"
" %s\n", tf->tf_ops->fabric_name);
+
+ tf->kobj = kobject_create_and_add(name, tcm_core_kobj);
+ if (!tf->kobj)
+ goto dec_tf;
+
/*
* On a successful target_core_get_fabric() look, the returned
* struct target_fabric_configfs *tf will contain a usage reference.
@@ -261,6 +269,10 @@ static struct config_group *target_core_register_fabric(
pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric: %s\n",
config_item_name(&tf->tf_group.cg_item));
return &tf->tf_group;
+
+dec_tf:
+ atomic_dec(&tf->tf_access_cnt);
+ return ERR_PTR(-EINVAL);
}
/*
@@ -283,6 +295,9 @@ static void target_core_deregister_fabric(
pr_debug("Target_Core_ConfigFS: DEREGISTER -> Releasing ci"
" %s\n", config_item_name(item));
+ kobject_del(tf->kobj);
+ kobject_put(tf->kobj);
+
configfs_remove_default_groups(&tf->tf_group);
config_item_put(item);
}
@@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
target_init_dbroot();
+ tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
+ if (!tcm_core_kobj)
+ goto out;
+
+ tcm_core_sessions_kobj = kobject_create_and_add("sessions",
+ tcm_core_kobj);
+ if (!tcm_core_sessions_kobj)
+ goto out;
+
return 0;
out:
@@ -3553,6 +3577,12 @@ static int __init target_core_init_configfs(void)
static void __exit target_core_exit_configfs(void)
{
+ kobject_del(tcm_core_sessions_kobj);
+ kobject_put(tcm_core_sessions_kobj);
+
+ kobject_del(tcm_core_kobj);
+ kobject_put(tcm_core_kobj);
+
configfs_remove_default_groups(&alua_lu_gps_group);
configfs_remove_default_groups(&alua_group);
configfs_remove_default_groups(&target_core_hbagroup);
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index ee85602..efa01b3 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -807,8 +807,23 @@ static void target_fabric_tpg_release(struct config_item *item)
struct se_portal_group, tpg_group);
struct se_wwn *wwn = se_tpg->se_tpg_wwn;
struct target_fabric_configfs *tf = wwn->wwn_tf;
+ struct kobject *sess_kobj, *tpg_kobj;
+
+ /*
+ * Some fabric modules remove the session from the drop_tpg
+ * callout, so remove these parent dirs until after the session
+ * is removed.
+ */
+ sess_kobj = se_tpg->sessions_kobj;
+ tpg_kobj = se_tpg->kobj;
tf->tf_ops->fabric_drop_tpg(se_tpg);
+
+ kobject_del(sess_kobj);
+ kobject_put(sess_kobj);
+
+ kobject_del(tpg_kobj);
+ kobject_put(tpg_kobj);
}
static struct configfs_item_operations target_fabric_tpg_base_item_ops = {
@@ -838,6 +853,14 @@ static struct config_group *target_fabric_make_tpg(
if (!se_tpg || IS_ERR(se_tpg))
return ERR_PTR(-EINVAL);
+ se_tpg->kobj = kobject_create_and_add(name, wwn->kobj);
+ if (!se_tpg->kobj)
+ goto drop_tpg;
+
+ se_tpg->sessions_kobj = kobject_create_and_add("sessions", se_tpg->kobj);
+ if (!se_tpg->sessions_kobj)
+ goto del_tpg_kobj;
+
config_group_init_type_name(&se_tpg->tpg_group, name,
&tf->tf_tpg_base_cit);
@@ -872,6 +895,13 @@ static struct config_group *target_fabric_make_tpg(
&se_tpg->tpg_group);
return &se_tpg->tpg_group;
+
+del_tpg_kobj:
+ kobject_del(se_tpg->kobj);
+ kobject_put(se_tpg->kobj);
+drop_tpg:
+ tf->tf_ops->fabric_drop_tpg(se_tpg);
+ return ERR_PTR(-EINVAL);
}
static void target_fabric_drop_tpg(
@@ -927,6 +957,7 @@ static struct config_group *target_fabric_make_wwn(
struct target_fabric_configfs *tf = container_of(group,
struct target_fabric_configfs, tf_group);
struct se_wwn *wwn;
+ int ret;
if (!tf->tf_ops->fabric_make_wwn) {
pr_err("tf->tf_ops.fabric_make_wwn is NULL\n");
@@ -938,6 +969,9 @@ static struct config_group *target_fabric_make_wwn(
return ERR_PTR(-EINVAL);
wwn->wwn_tf = tf;
+ wwn->kobj = kobject_create_and_add(name, tf->kobj);
+ if (!wwn->kobj)
+ goto drop_wwn;
config_group_init_type_name(&wwn->wwn_group, name, &tf->tf_tpg_cit);
@@ -948,6 +982,10 @@ static struct config_group *target_fabric_make_wwn(
if (tf->tf_ops->add_wwn_groups)
tf->tf_ops->add_wwn_groups(wwn);
return &wwn->wwn_group;
+
+drop_wwn:
+ tf->tf_ops->fabric_drop_wwn(wwn);
+ return ERR_PTR(ret);
}
static void target_fabric_drop_wwn(
@@ -957,6 +995,8 @@ static void target_fabric_drop_wwn(
struct se_wwn *wwn = container_of(to_config_group(item),
struct se_wwn, wwn_group);
+ kobject_del(wwn->kobj);
+ kobject_put(wwn->kobj);
configfs_remove_default_groups(&wwn->wwn_group);
config_item_put(item);
}
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 5e016aa..aea50f1 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -27,6 +27,7 @@ struct target_backend {
struct target_fabric_configfs {
atomic_t tf_access_cnt;
struct list_head tf_list;
+ struct kobject *kobj;
struct config_group tf_group;
struct config_group tf_disc_group;
const struct target_core_fabric_ops *tf_ops;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index d4a588d..16d2a4c 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -8,6 +8,7 @@
#include <linux/percpu-refcount.h>
#include <linux/semaphore.h> /* struct semaphore */
#include <linux/completion.h>
+#include <linux/kobject.h>
#define TARGET_CORE_VERSION "v5.0"
@@ -897,6 +898,8 @@ struct se_portal_group {
/* Pointer to $FABRIC_MOD dependent code */
const struct target_core_fabric_ops *se_tpg_tfo;
struct se_wwn *se_tpg_wwn;
+ struct kobject *kobj;
+ struct kobject *sessions_kobj;
struct config_group tpg_group;
struct config_group tpg_lun_group;
struct config_group tpg_np_group;
@@ -935,6 +938,7 @@ struct se_wwn {
void *priv;
struct config_group wwn_group;
struct config_group fabric_stat_group;
+ struct kobject *kobj;
};
static inline void atomic_inc_mb(atomic_t *v)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 08/11] target: add sysfs session helper functions
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
This patch adds helpers to add/remove a dir per session. There is
only 2 files/dirs.
acl - name of acl session is accessed through.
transport_id - Contains fabric module specific transportID values.
scsi_target/
├── iscsi
│ └── iqn.1999-09.com.tcmu:alua
│ └── tpgt_1
│ └── sessions
│ └── session-1
│ ├── acl
│ └── transport_id
│ ├── name
│ ├── proto
│ └── session_id
└── sessions
└── session-1 ->
../iscsi/iqn.1999-09.com.tcmu:alua/tpgt_1/sessions/session-1
Fabric drivers like iscsi or elx can add pass in an attribute_group
to add driver specific attrs via the target_core_fabric_ops
session_attrs field.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V2:
- Fix extra newline
- Copy data that's exported to sysfs so we do not have to worry about
configfs and sysfs refcounts.
- adds back the global sid allocator instead of the per tpg
one because in the future we will want to tag target_core_user commands
with the session id. This will be needed when tcmu devices are mapped
to multiple fabric modules or tpgs and they userspace needs to track
the different session to command mappings for commands like PRs.
V3:
- add session symlink
- use simple ida.
drivers/target/Makefile | 1 +
drivers/target/target_core_configfs.c | 2 +-
drivers/target/target_core_internal.h | 5 +
drivers/target/target_core_sysfs.c | 194 +++++++++++++++++++++++++++++++++
drivers/target/target_core_transport.c | 35 +++++-
include/target/target_core_base.h | 6 +
include/target/target_core_fabric.h | 8 +-
7 files changed, 243 insertions(+), 8 deletions(-)
create mode 100644 drivers/target/target_core_sysfs.c
diff --git a/drivers/target/Makefile b/drivers/target/Makefile
index 4563474..4a7246e 100644
--- a/drivers/target/Makefile
+++ b/drivers/target/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
target_core_mod-y := target_core_configfs.o \
+ target_core_sysfs.o \
target_core_device.o \
target_core_fabric_configfs.o \
target_core_fabric_lib.o \
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 20aa58b..c557deb 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -64,7 +64,7 @@
}
static struct kobject *tcm_core_kobj;
-static struct kobject *tcm_core_sessions_kobj;
+struct kobject *tcm_core_sessions_kobj;
extern struct t10_alua_lu_gp *default_lu_gp;
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index aea50f1..74b9098 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -91,6 +91,7 @@ int target_for_each_device(int (*fn)(struct se_device *dev, void *data),
void *data);
/* target_core_configfs.c */
+extern struct kobject *tcm_core_sessions_kobj;
extern struct configfs_item_operations target_core_dev_item_ops;
void target_setup_backend_cits(struct target_backend *);
@@ -107,6 +108,9 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
char *buf, u32 *out_tid_len, char **port_nexus_ptr);
void target_free_transport_id(struct t10_transport_id *tpid);
+/* target_core_sysfs.c */
+void target_sysfs_init_session(struct se_session *sess);
+
/* target_core_hba.c */
struct se_hba *core_alloc_hba(const char *, u32, u32);
int core_delete_hba(struct se_hba *);
@@ -154,6 +158,7 @@ void transport_dump_dev_info(struct se_device *, struct se_lun *,
bool target_check_wce(struct se_device *dev);
bool target_check_fua(struct se_device *dev);
void __target_execute_cmd(struct se_cmd *, bool);
+void __target_free_session(struct se_session *);
/* target_core_stat.c */
void target_stat_setup_dev_default_groups(struct se_device *);
diff --git a/drivers/target/target_core_sysfs.c b/drivers/target/target_core_sysfs.c
new file mode 100644
index 0000000..af0005a
--- /dev/null
+++ b/drivers/target/target_core_sysfs.c
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/kobject.h>
+#include <linux/idr.h>
+
+#include <scsi/scsi_proto.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_fabric.h>
+#include "target_core_internal.h"
+
+static void target_sysfs_session_release(struct kobject *kobj)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+
+ __target_free_session(se_sess);
+}
+
+struct session_attr {
+ struct attribute attr;
+ ssize_t (*show)(struct se_session *, char *);
+ ssize_t (*store)(struct se_session *, const char *, size_t);
+};
+
+#define to_session(atr) container_of((atr), struct session_attr, attr)
+
+static ssize_t session_acl_show(struct se_session *se_sess, char *page)
+{
+ return snprintf(page, PAGE_SIZE, "%s\n", se_sess->acl_name ?
+ se_sess->acl_name : "");
+}
+
+static struct session_attr session_acl_attr = {
+ .attr = { .name = "acl", .mode = S_IRUGO },
+ .show = session_acl_show,
+};
+
+/* Default attrs common to all fabric modules */
+static struct attribute *session_attrs[] = {
+ &session_acl_attr.attr,
+ NULL
+};
+
+static const struct attribute_group session_group = {
+ .attrs = session_attrs,
+};
+
+/* transportID attrs */
+#define transport_id_attr_show(name, fmt_str) \
+static ssize_t show_##name(struct se_session *se_sess, char *page) \
+{ \
+ return snprintf(page, PAGE_SIZE, fmt_str, se_sess->tpid->name); \
+}
+
+#define transport_id_attr(name, fmt_str) \
+ transport_id_attr_show(name, fmt_str) \
+static struct session_attr transport_id_##name##_attr = \
+ __ATTR(name, S_IRUGO, show_##name, NULL)
+
+transport_id_attr(proto, "%u\n");
+transport_id_attr(name, "%s\n");
+
+static ssize_t session_id_show(struct se_session *se_sess, char *page)
+{
+ return snprintf(page, PAGE_SIZE, "%s\n", se_sess->tpid->session_id ?
+ se_sess->tpid->session_id : "");
+}
+
+static struct session_attr transport_id_session_id_attr = {
+ .attr = { .name = "session_id", .mode = S_IRUGO },
+ .show = session_id_show,
+};
+
+static struct attribute *transport_id_attrs[] = {
+ &transport_id_proto_attr.attr,
+ &transport_id_name_attr.attr,
+ &transport_id_session_id_attr.attr,
+ NULL
+};
+
+static const struct attribute_group transport_id_group = {
+ .name = "transport_id",
+ .attrs = transport_id_attrs,
+};
+
+static ssize_t
+session_attr_store(struct kobject *kobj, struct attribute *attr,
+ const char *page, size_t length)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+ struct session_attr *sess_attr = to_session(attr);
+
+ if (!sess_attr->store)
+ return -ENOSYS;
+
+ return sess_attr->store(se_sess, page, length);
+}
+
+static ssize_t
+session_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+ struct session_attr *sess_attr = to_session(attr);
+
+ if (!sess_attr->show)
+ return -ENOSYS;
+
+ return sess_attr->show(se_sess, page);
+}
+
+static const struct sysfs_ops session_sysfs_ops = {
+ .show = session_attr_show,
+ .store = session_attr_store,
+};
+
+static const struct attribute_group *def_session_groups[] = {
+ &session_group,
+ &transport_id_group,
+ NULL
+};
+
+static struct kobj_type session_ktype = {
+ .sysfs_ops = &session_sysfs_ops,
+ .release = target_sysfs_session_release,
+ .default_groups = def_session_groups,
+};
+
+void target_sysfs_init_session(struct se_session *se_sess)
+{
+ kobject_init(&se_sess->kobj, &session_ktype);
+}
+
+int target_sysfs_add_session(struct se_portal_group *se_tpg,
+ struct se_session *se_sess)
+{
+ int ret;
+
+ /*
+ * Copy ACL name so we don't have to worry about mixing configfs
+ * and sysfs refcounts.
+ */
+ if (!se_sess->se_node_acl->dynamic_node_acl) {
+ se_sess->acl_name = kstrdup(se_sess->se_node_acl->initiatorname,
+ GFP_KERNEL);
+ if (!se_sess->acl_name)
+ return -ENOMEM;
+ }
+
+ ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
+ se_sess->sid);
+ if (ret) {
+ pr_err("Could not add session%d to sysfs. Error %d.\n",
+ se_sess->sid, ret);
+ goto free_acl_name;
+ }
+
+ if (se_sess->tfo->session_attrs) {
+ ret = sysfs_create_group(&se_sess->kobj,
+ se_sess->tfo->session_attrs);
+ if (ret)
+ goto del_kobj;
+ }
+
+ ret = sysfs_create_link(tcm_core_sessions_kobj, &se_sess->kobj,
+ se_sess->kobj.name);
+ if (ret)
+ goto rm_group;
+
+ se_sess->sysfs_added = true;
+ return 0;
+
+rm_group:
+ if (se_sess->tfo->session_attrs)
+ sysfs_remove_group(&se_sess->kobj, se_sess->tfo->session_attrs);
+del_kobj:
+ kobject_del(&se_sess->kobj);
+free_acl_name:
+ kfree(se_sess->acl_name);
+ se_sess->acl_name = NULL;
+ return ret;
+}
+EXPORT_SYMBOL(target_sysfs_add_session);
+
+void target_sysfs_remove_session(struct se_session *se_sess)
+{
+ /* discovery sessions are normally not added to sysfs */
+ if (!se_sess->sysfs_added)
+ return;
+
+ sysfs_remove_link(tcm_core_sessions_kobj, se_sess->kobj.name);
+ if (se_sess->tfo->session_attrs)
+ sysfs_remove_group(&se_sess->kobj, se_sess->tfo->session_attrs);
+ kobject_del(&se_sess->kobj);
+}
+EXPORT_SYMBOL(target_sysfs_remove_session);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 369cd7e..7f04b7bf 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -42,6 +42,7 @@
static struct workqueue_struct *target_completion_wq;
static struct kmem_cache *se_sess_cache;
+static DEFINE_IDA(se_sess_ida);
struct kmem_cache *se_ua_cache;
struct kmem_cache *t10_pr_reg_cache;
struct kmem_cache *t10_alua_lu_gp_cache;
@@ -251,14 +252,27 @@ struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops)
" se_sess_cache\n");
return ERR_PTR(-ENOMEM);
}
- ret = transport_init_session(se_sess);
+
+ ret = ida_simple_get(&se_sess_ida, 1, 0, GFP_KERNEL);
if (ret < 0) {
- kmem_cache_free(se_sess_cache, se_sess);
- return ERR_PTR(ret);
+ pr_err("Unable to allocate session index.\n");
+ goto free_sess;
}
- se_sess->sup_prot_ops = sup_prot_ops;
+ se_sess->sid = ret;
+
+ ret = transport_init_session(se_sess);
+ if (ret < 0)
+ goto free_sid;
+ se_sess->sup_prot_ops = sup_prot_ops;
+ target_sysfs_init_session(se_sess);
return se_sess;
+
+free_sid:
+ ida_simple_remove(&se_sess_ida, se_sess->sid);
+free_sess:
+ kmem_cache_free(se_sess_cache, se_sess);
+ return ERR_PTR(ret);
}
EXPORT_SYMBOL(transport_alloc_session);
@@ -585,12 +599,21 @@ void transport_free_session(struct se_session *se_sess)
sbitmap_queue_free(&se_sess->sess_tag_pool);
kvfree(se_sess->sess_cmd_map);
}
- target_free_transport_id(se_sess->tpid);
percpu_ref_exit(&se_sess->cmd_count);
- kmem_cache_free(se_sess_cache, se_sess);
+ kobject_put(&se_sess->kobj);
}
EXPORT_SYMBOL(transport_free_session);
+void __target_free_session(struct se_session *se_sess)
+{
+ kfree(se_sess->acl_name);
+ target_free_transport_id(se_sess->tpid);
+
+ ida_simple_remove(&se_sess_ida, se_sess->sid);
+
+ kmem_cache_free(se_sess_cache, se_sess);
+}
+
static int target_release_res(struct se_device *dev, void *data)
{
struct se_session *sess = data;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 16d2a4c..a1ae82f 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -9,6 +9,7 @@
#include <linux/semaphore.h> /* struct semaphore */
#include <linux/completion.h>
#include <linux/kobject.h>
+#include <linux/idr.h>
#define TARGET_CORE_VERSION "v5.0"
@@ -621,6 +622,7 @@ struct se_session {
enum target_prot_op sup_prot_ops;
enum target_prot_type sess_prot_type;
struct se_node_acl *se_node_acl;
+ char *acl_name;
struct se_portal_group *se_tpg;
void *fabric_sess_ptr;
struct percpu_ref cmd_count;
@@ -631,6 +633,10 @@ struct se_session {
wait_queue_head_t cmd_list_wq;
void *sess_cmd_map;
struct sbitmap_queue sess_tag_pool;
+ struct kobject kobj;
+ int sid;
+ bool sysfs_added;
+ const struct target_core_fabric_ops *tfo;
};
struct se_device;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 0c1720d..be43180 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -74,6 +74,10 @@ struct target_core_fabric_ops {
int (*queue_status)(struct se_cmd *);
void (*queue_tm_rsp)(struct se_cmd *);
void (*aborted_task)(struct se_cmd *);
+
+ /* Optional session management and sysfs callouts */
+ const struct attribute_group *session_attrs;
+
/*
* fabric module calls for target_core_fabric_configfs.c
*/
@@ -141,7 +145,9 @@ void transport_register_session(struct se_portal_group *,
void target_put_nacl(struct se_node_acl *);
void transport_deregister_session_configfs(struct se_session *);
void transport_deregister_session(struct se_session *);
-
+void target_sysfs_remove_session(struct se_session *se_sess);
+int target_sysfs_add_session(struct se_portal_group *se_tpg,
+ struct se_session *se_sess);
void transport_init_se_cmd(struct se_cmd *,
const struct target_core_fabric_ops *,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 08/11] target: add sysfs session helper functions
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
This patch adds helpers to add/remove a dir per session. There is
only 2 files/dirs.
acl - name of acl session is accessed through.
transport_id - Contains fabric module specific transportID values.
scsi_target/
├── iscsi
│ └── iqn.1999-09.com.tcmu:alua
│ └── tpgt_1
│ └── sessions
│ └── session-1
│ ├── acl
│ └── transport_id
│ ├── name
│ ├── proto
│ └── session_id
└── sessions
└── session-1 ->
../iscsi/iqn.1999-09.com.tcmu:alua/tpgt_1/sessions/session-1
Fabric drivers like iscsi or elx can add pass in an attribute_group
to add driver specific attrs via the target_core_fabric_ops
session_attrs field.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V2:
- Fix extra newline
- Copy data that's exported to sysfs so we do not have to worry about
configfs and sysfs refcounts.
- adds back the global sid allocator instead of the per tpg
one because in the future we will want to tag target_core_user commands
with the session id. This will be needed when tcmu devices are mapped
to multiple fabric modules or tpgs and they userspace needs to track
the different session to command mappings for commands like PRs.
V3:
- add session symlink
- use simple ida.
drivers/target/Makefile | 1 +
drivers/target/target_core_configfs.c | 2 +-
drivers/target/target_core_internal.h | 5 +
drivers/target/target_core_sysfs.c | 194 +++++++++++++++++++++++++++++++++
drivers/target/target_core_transport.c | 35 +++++-
include/target/target_core_base.h | 6 +
include/target/target_core_fabric.h | 8 +-
7 files changed, 243 insertions(+), 8 deletions(-)
create mode 100644 drivers/target/target_core_sysfs.c
diff --git a/drivers/target/Makefile b/drivers/target/Makefile
index 4563474..4a7246e 100644
--- a/drivers/target/Makefile
+++ b/drivers/target/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
target_core_mod-y := target_core_configfs.o \
+ target_core_sysfs.o \
target_core_device.o \
target_core_fabric_configfs.o \
target_core_fabric_lib.o \
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 20aa58b..c557deb 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -64,7 +64,7 @@
}
static struct kobject *tcm_core_kobj;
-static struct kobject *tcm_core_sessions_kobj;
+struct kobject *tcm_core_sessions_kobj;
extern struct t10_alua_lu_gp *default_lu_gp;
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index aea50f1..74b9098 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -91,6 +91,7 @@ int target_for_each_device(int (*fn)(struct se_device *dev, void *data),
void *data);
/* target_core_configfs.c */
+extern struct kobject *tcm_core_sessions_kobj;
extern struct configfs_item_operations target_core_dev_item_ops;
void target_setup_backend_cits(struct target_backend *);
@@ -107,6 +108,9 @@ const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg,
char *buf, u32 *out_tid_len, char **port_nexus_ptr);
void target_free_transport_id(struct t10_transport_id *tpid);
+/* target_core_sysfs.c */
+void target_sysfs_init_session(struct se_session *sess);
+
/* target_core_hba.c */
struct se_hba *core_alloc_hba(const char *, u32, u32);
int core_delete_hba(struct se_hba *);
@@ -154,6 +158,7 @@ void transport_dump_dev_info(struct se_device *, struct se_lun *,
bool target_check_wce(struct se_device *dev);
bool target_check_fua(struct se_device *dev);
void __target_execute_cmd(struct se_cmd *, bool);
+void __target_free_session(struct se_session *);
/* target_core_stat.c */
void target_stat_setup_dev_default_groups(struct se_device *);
diff --git a/drivers/target/target_core_sysfs.c b/drivers/target/target_core_sysfs.c
new file mode 100644
index 0000000..af0005a
--- /dev/null
+++ b/drivers/target/target_core_sysfs.c
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/kobject.h>
+#include <linux/idr.h>
+
+#include <scsi/scsi_proto.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_fabric.h>
+#include "target_core_internal.h"
+
+static void target_sysfs_session_release(struct kobject *kobj)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+
+ __target_free_session(se_sess);
+}
+
+struct session_attr {
+ struct attribute attr;
+ ssize_t (*show)(struct se_session *, char *);
+ ssize_t (*store)(struct se_session *, const char *, size_t);
+};
+
+#define to_session(atr) container_of((atr), struct session_attr, attr)
+
+static ssize_t session_acl_show(struct se_session *se_sess, char *page)
+{
+ return snprintf(page, PAGE_SIZE, "%s\n", se_sess->acl_name ?
+ se_sess->acl_name : "");
+}
+
+static struct session_attr session_acl_attr = {
+ .attr = { .name = "acl", .mode = S_IRUGO },
+ .show = session_acl_show,
+};
+
+/* Default attrs common to all fabric modules */
+static struct attribute *session_attrs[] = {
+ &session_acl_attr.attr,
+ NULL
+};
+
+static const struct attribute_group session_group = {
+ .attrs = session_attrs,
+};
+
+/* transportID attrs */
+#define transport_id_attr_show(name, fmt_str) \
+static ssize_t show_##name(struct se_session *se_sess, char *page) \
+{ \
+ return snprintf(page, PAGE_SIZE, fmt_str, se_sess->tpid->name); \
+}
+
+#define transport_id_attr(name, fmt_str) \
+ transport_id_attr_show(name, fmt_str) \
+static struct session_attr transport_id_##name##_attr = \
+ __ATTR(name, S_IRUGO, show_##name, NULL)
+
+transport_id_attr(proto, "%u\n");
+transport_id_attr(name, "%s\n");
+
+static ssize_t session_id_show(struct se_session *se_sess, char *page)
+{
+ return snprintf(page, PAGE_SIZE, "%s\n", se_sess->tpid->session_id ?
+ se_sess->tpid->session_id : "");
+}
+
+static struct session_attr transport_id_session_id_attr = {
+ .attr = { .name = "session_id", .mode = S_IRUGO },
+ .show = session_id_show,
+};
+
+static struct attribute *transport_id_attrs[] = {
+ &transport_id_proto_attr.attr,
+ &transport_id_name_attr.attr,
+ &transport_id_session_id_attr.attr,
+ NULL
+};
+
+static const struct attribute_group transport_id_group = {
+ .name = "transport_id",
+ .attrs = transport_id_attrs,
+};
+
+static ssize_t
+session_attr_store(struct kobject *kobj, struct attribute *attr,
+ const char *page, size_t length)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+ struct session_attr *sess_attr = to_session(attr);
+
+ if (!sess_attr->store)
+ return -ENOSYS;
+
+ return sess_attr->store(se_sess, page, length);
+}
+
+static ssize_t
+session_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
+{
+ struct se_session *se_sess = container_of(kobj, struct se_session, kobj);
+ struct session_attr *sess_attr = to_session(attr);
+
+ if (!sess_attr->show)
+ return -ENOSYS;
+
+ return sess_attr->show(se_sess, page);
+}
+
+static const struct sysfs_ops session_sysfs_ops = {
+ .show = session_attr_show,
+ .store = session_attr_store,
+};
+
+static const struct attribute_group *def_session_groups[] = {
+ &session_group,
+ &transport_id_group,
+ NULL
+};
+
+static struct kobj_type session_ktype = {
+ .sysfs_ops = &session_sysfs_ops,
+ .release = target_sysfs_session_release,
+ .default_groups = def_session_groups,
+};
+
+void target_sysfs_init_session(struct se_session *se_sess)
+{
+ kobject_init(&se_sess->kobj, &session_ktype);
+}
+
+int target_sysfs_add_session(struct se_portal_group *se_tpg,
+ struct se_session *se_sess)
+{
+ int ret;
+
+ /*
+ * Copy ACL name so we don't have to worry about mixing configfs
+ * and sysfs refcounts.
+ */
+ if (!se_sess->se_node_acl->dynamic_node_acl) {
+ se_sess->acl_name = kstrdup(se_sess->se_node_acl->initiatorname,
+ GFP_KERNEL);
+ if (!se_sess->acl_name)
+ return -ENOMEM;
+ }
+
+ ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
+ se_sess->sid);
+ if (ret) {
+ pr_err("Could not add session%d to sysfs. Error %d.\n",
+ se_sess->sid, ret);
+ goto free_acl_name;
+ }
+
+ if (se_sess->tfo->session_attrs) {
+ ret = sysfs_create_group(&se_sess->kobj,
+ se_sess->tfo->session_attrs);
+ if (ret)
+ goto del_kobj;
+ }
+
+ ret = sysfs_create_link(tcm_core_sessions_kobj, &se_sess->kobj,
+ se_sess->kobj.name);
+ if (ret)
+ goto rm_group;
+
+ se_sess->sysfs_added = true;
+ return 0;
+
+rm_group:
+ if (se_sess->tfo->session_attrs)
+ sysfs_remove_group(&se_sess->kobj, se_sess->tfo->session_attrs);
+del_kobj:
+ kobject_del(&se_sess->kobj);
+free_acl_name:
+ kfree(se_sess->acl_name);
+ se_sess->acl_name = NULL;
+ return ret;
+}
+EXPORT_SYMBOL(target_sysfs_add_session);
+
+void target_sysfs_remove_session(struct se_session *se_sess)
+{
+ /* discovery sessions are normally not added to sysfs */
+ if (!se_sess->sysfs_added)
+ return;
+
+ sysfs_remove_link(tcm_core_sessions_kobj, se_sess->kobj.name);
+ if (se_sess->tfo->session_attrs)
+ sysfs_remove_group(&se_sess->kobj, se_sess->tfo->session_attrs);
+ kobject_del(&se_sess->kobj);
+}
+EXPORT_SYMBOL(target_sysfs_remove_session);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 369cd7e..7f04b7bf 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -42,6 +42,7 @@
static struct workqueue_struct *target_completion_wq;
static struct kmem_cache *se_sess_cache;
+static DEFINE_IDA(se_sess_ida);
struct kmem_cache *se_ua_cache;
struct kmem_cache *t10_pr_reg_cache;
struct kmem_cache *t10_alua_lu_gp_cache;
@@ -251,14 +252,27 @@ struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops)
" se_sess_cache\n");
return ERR_PTR(-ENOMEM);
}
- ret = transport_init_session(se_sess);
+
+ ret = ida_simple_get(&se_sess_ida, 1, 0, GFP_KERNEL);
if (ret < 0) {
- kmem_cache_free(se_sess_cache, se_sess);
- return ERR_PTR(ret);
+ pr_err("Unable to allocate session index.\n");
+ goto free_sess;
}
- se_sess->sup_prot_ops = sup_prot_ops;
+ se_sess->sid = ret;
+
+ ret = transport_init_session(se_sess);
+ if (ret < 0)
+ goto free_sid;
+ se_sess->sup_prot_ops = sup_prot_ops;
+ target_sysfs_init_session(se_sess);
return se_sess;
+
+free_sid:
+ ida_simple_remove(&se_sess_ida, se_sess->sid);
+free_sess:
+ kmem_cache_free(se_sess_cache, se_sess);
+ return ERR_PTR(ret);
}
EXPORT_SYMBOL(transport_alloc_session);
@@ -585,12 +599,21 @@ void transport_free_session(struct se_session *se_sess)
sbitmap_queue_free(&se_sess->sess_tag_pool);
kvfree(se_sess->sess_cmd_map);
}
- target_free_transport_id(se_sess->tpid);
percpu_ref_exit(&se_sess->cmd_count);
- kmem_cache_free(se_sess_cache, se_sess);
+ kobject_put(&se_sess->kobj);
}
EXPORT_SYMBOL(transport_free_session);
+void __target_free_session(struct se_session *se_sess)
+{
+ kfree(se_sess->acl_name);
+ target_free_transport_id(se_sess->tpid);
+
+ ida_simple_remove(&se_sess_ida, se_sess->sid);
+
+ kmem_cache_free(se_sess_cache, se_sess);
+}
+
static int target_release_res(struct se_device *dev, void *data)
{
struct se_session *sess = data;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 16d2a4c..a1ae82f 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -9,6 +9,7 @@
#include <linux/semaphore.h> /* struct semaphore */
#include <linux/completion.h>
#include <linux/kobject.h>
+#include <linux/idr.h>
#define TARGET_CORE_VERSION "v5.0"
@@ -621,6 +622,7 @@ struct se_session {
enum target_prot_op sup_prot_ops;
enum target_prot_type sess_prot_type;
struct se_node_acl *se_node_acl;
+ char *acl_name;
struct se_portal_group *se_tpg;
void *fabric_sess_ptr;
struct percpu_ref cmd_count;
@@ -631,6 +633,10 @@ struct se_session {
wait_queue_head_t cmd_list_wq;
void *sess_cmd_map;
struct sbitmap_queue sess_tag_pool;
+ struct kobject kobj;
+ int sid;
+ bool sysfs_added;
+ const struct target_core_fabric_ops *tfo;
};
struct se_device;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 0c1720d..be43180 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -74,6 +74,10 @@ struct target_core_fabric_ops {
int (*queue_status)(struct se_cmd *);
void (*queue_tm_rsp)(struct se_cmd *);
void (*aborted_task)(struct se_cmd *);
+
+ /* Optional session management and sysfs callouts */
+ const struct attribute_group *session_attrs;
+
/*
* fabric module calls for target_core_fabric_configfs.c
*/
@@ -141,7 +145,9 @@ void transport_register_session(struct se_portal_group *,
void target_put_nacl(struct se_node_acl *);
void transport_deregister_session_configfs(struct se_session *);
void transport_deregister_session(struct se_session *);
-
+void target_sysfs_remove_session(struct se_session *se_sess);
+int target_sysfs_add_session(struct se_portal_group *se_tpg,
+ struct se_session *se_sess);
void transport_init_se_cmd(struct se_cmd *,
const struct target_core_fabric_ops *,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 09/11] target: add target_setup_session sysfs support
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
This adds a session dir per session for users of target_setup_session.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_transport.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 7f04b7bf..37aa6de 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -446,6 +446,7 @@ struct se_session *
if (IS_ERR(sess))
return sess;
+ sess->tfo = tpg->se_tpg_tfo;
sess->tpid = target_cp_transport_id(tpid);
if (!sess->tpid) {
@@ -459,6 +460,10 @@ struct se_session *
rc = -EACCES;
goto free_sess;
}
+
+ rc = target_sysfs_add_session(tpg, sess);
+ if (rc)
+ goto free_sess;
/*
* Go ahead and perform any remaining fabric setup that is
* required before transport_register_session().
@@ -466,12 +471,14 @@ struct se_session *
if (callback != NULL) {
rc = callback(tpg, sess, private);
if (rc)
- goto free_sess;
+ goto rm_sysfs;
}
transport_register_session(tpg, sess->se_node_acl, sess, private);
return sess;
+rm_sysfs:
+ target_sysfs_remove_session(sess);
free_sess:
transport_free_session(sess);
return ERR_PTR(rc);
@@ -662,6 +669,7 @@ void transport_deregister_session(struct se_session *se_sess)
void target_remove_session(struct se_session *se_sess)
{
+ target_sysfs_remove_session(se_sess);
transport_deregister_session_configfs(se_sess);
transport_deregister_session(se_sess);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 09/11] target: add target_setup_session sysfs support
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
This adds a session dir per session for users of target_setup_session.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_transport.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 7f04b7bf..37aa6de 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -446,6 +446,7 @@ struct se_session *
if (IS_ERR(sess))
return sess;
+ sess->tfo = tpg->se_tpg_tfo;
sess->tpid = target_cp_transport_id(tpid);
if (!sess->tpid) {
@@ -459,6 +460,10 @@ struct se_session *
rc = -EACCES;
goto free_sess;
}
+
+ rc = target_sysfs_add_session(tpg, sess);
+ if (rc)
+ goto free_sess;
/*
* Go ahead and perform any remaining fabric setup that is
* required before transport_register_session().
@@ -466,12 +471,14 @@ struct se_session *
if (callback != NULL) {
rc = callback(tpg, sess, private);
if (rc)
- goto free_sess;
+ goto rm_sysfs;
}
transport_register_session(tpg, sess->se_node_acl, sess, private);
return sess;
+rm_sysfs:
+ target_sysfs_remove_session(sess);
free_sess:
transport_free_session(sess);
return ERR_PTR(rc);
@@ -662,6 +669,7 @@ void transport_deregister_session(struct se_session *se_sess)
void target_remove_session(struct se_session *se_sess)
{
+ target_sysfs_remove_session(se_sess);
transport_deregister_session_configfs(se_sess);
transport_deregister_session(se_sess);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 10/11] iscsi target: use session sysfs helpers
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
The iscsi target login process breaks up session allocation and
registration, so it does not use target_setup_session like every one
else. This converts iscsi to use the session sysfs helpers and drops its
session id to use the common one.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V3:
- Fix goto use. Actually moved sysfs addition call to after nego
to avoid sysfs additions when login ends up failing.
drivers/target/iscsi/iscsi_target.c | 3 +--
drivers/target/iscsi/iscsi_target_configfs.c | 4 +---
drivers/target/iscsi/iscsi_target_login.c | 16 ++--------------
drivers/target/iscsi/iscsi_target_nego.c | 8 ++++++++
drivers/target/iscsi/iscsi_target_stat.c | 3 +--
include/target/iscsi/iscsi_target_core.h | 2 --
6 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 09e55ea..ca0bc26 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -49,7 +49,6 @@
static DEFINE_MUTEX(np_lock);
static struct idr tiqn_idr;
-DEFINE_IDA(sess_ida);
struct mutex auth_id_lock;
struct iscsit_global *iscsit_global;
@@ -4352,6 +4351,7 @@ int iscsit_close_session(struct iscsi_session *sess)
iscsit_stop_time2retain_timer(sess);
spin_unlock_bh(&se_tpg->session_lock);
+ target_sysfs_remove_session(sess->se_sess);
/*
* transport_deregister_session_configfs() will clear the
* struct se_node_acl->nacl_sess pointer now as a iscsi_np process context
@@ -4397,7 +4397,6 @@ int iscsit_close_session(struct iscsi_session *sess)
pr_debug("Decremented number of active iSCSI Sessions on"
" iSCSI TPG: %hu to %u\n", tpg->tpgt, tpg->nsessions);
- ida_free(&sess_ida, sess->session_index);
kfree(sess->sess_ops);
sess->sess_ops = NULL;
spin_unlock_bh(&se_tpg->session_lock);
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index f640e7a..c40cff1 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1344,9 +1344,7 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
static u32 lio_sess_get_index(struct se_session *se_sess)
{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
- return sess->session_index;
+ return se_sess->sid;
}
static int lio_queue_data_in(struct se_cmd *se_cmd)
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index f533308..a0ea60f 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -257,7 +257,6 @@ static int iscsi_login_zero_tsih_s1(
{
struct iscsi_session *sess = NULL;
struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;
- int ret;
sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);
if (!sess) {
@@ -291,15 +290,6 @@ static int iscsi_login_zero_tsih_s1(
timer_setup(&sess->time2retain_timer,
iscsit_handle_time2retain_timeout, 0);
- ret = ida_alloc(&sess_ida, GFP_KERNEL);
- if (ret < 0) {
- pr_err("Session ID allocation failed %d\n", ret);
- iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
- ISCSI_LOGIN_STATUS_NO_RESOURCES);
- goto free_sess;
- }
-
- sess->session_index = ret;
sess->creation_time = get_jiffies_64();
/*
* The FFP CmdSN window values will be allocated from the TPG's
@@ -313,7 +303,7 @@ static int iscsi_login_zero_tsih_s1(
ISCSI_LOGIN_STATUS_NO_RESOURCES);
pr_err("Unable to allocate memory for"
" struct iscsi_sess_ops.\n");
- goto free_id;
+ goto free_ops;
}
sess->se_sess = transport_alloc_session(TARGET_PROT_NORMAL);
@@ -327,8 +317,6 @@ static int iscsi_login_zero_tsih_s1(
free_ops:
kfree(sess->sess_ops);
-free_id:
- ida_free(&sess_ida, sess->session_index);
free_sess:
kfree(sess);
conn->sess = NULL;
@@ -1182,8 +1170,8 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn,
if (!zero_tsih || !conn->sess)
goto old_sess_out;
+ target_sysfs_remove_session(conn->sess->se_sess);
transport_free_session(conn->sess->se_sess);
- ida_free(&sess_ida, conn->sess->session_index);
kfree(conn->sess->sess_ops);
kfree(conn->sess);
conn->sess = NULL;
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index dce2fe2..298c8a5 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -359,6 +359,13 @@ static int iscsi_target_do_tx_login_io(struct iscsi_conn *conn, struct iscsi_log
ISCSI_LOGIN_STATUS_NO_RESOURCES);
return -1;
}
+
+ if (target_sysfs_add_session(&conn->tpg->tpg_se_tpg,
+ conn->sess->se_sess)) {
+ iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+ ISCSI_LOGIN_STATUS_NO_RESOURCES);
+ return -1;
+ }
}
if (conn->conn_transport->iscsit_put_login_tx(conn, login,
@@ -1281,6 +1288,7 @@ int iscsi_target_locate_portal(
ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size);
if (ret < 0)
goto return_oom;
+ sess->se_sess->tfo = &iscsi_ops;
if (conn->tpg != iscsit_global->discovery_tpg) {
if (iscsi_setup_i_tpid(sess, i_buf))
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index 35e75a3..8167fdc 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -630,8 +630,7 @@ static ssize_t iscsi_stat_sess_indx_show(struct config_item *item, char *page)
if (se_sess) {
sess = se_sess->fabric_sess_ptr;
if (sess)
- ret = snprintf(page, PAGE_SIZE, "%u\n",
- sess->session_index);
+ ret = snprintf(page, PAGE_SIZE, "%u\n", se_sess->sid);
}
spin_unlock_bh(&se_nacl->nacl_sess_lock);
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index a49d371..aeabb83 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -657,8 +657,6 @@ struct iscsi_session {
/* LIO specific session ID */
u32 sid;
char auth_type[8];
- /* unique within the target */
- int session_index;
/* Used for session reference counting */
int session_usage_count;
int session_waiting_on_uc;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 10/11] iscsi target: use session sysfs helpers
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
The iscsi target login process breaks up session allocation and
registration, so it does not use target_setup_session like every one
else. This converts iscsi to use the session sysfs helpers and drops its
session id to use the common one.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
V3:
- Fix goto use. Actually moved sysfs addition call to after nego
to avoid sysfs additions when login ends up failing.
drivers/target/iscsi/iscsi_target.c | 3 +--
drivers/target/iscsi/iscsi_target_configfs.c | 4 +---
drivers/target/iscsi/iscsi_target_login.c | 16 ++--------------
drivers/target/iscsi/iscsi_target_nego.c | 8 ++++++++
drivers/target/iscsi/iscsi_target_stat.c | 3 +--
include/target/iscsi/iscsi_target_core.h | 2 --
6 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 09e55ea..ca0bc26 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -49,7 +49,6 @@
static DEFINE_MUTEX(np_lock);
static struct idr tiqn_idr;
-DEFINE_IDA(sess_ida);
struct mutex auth_id_lock;
struct iscsit_global *iscsit_global;
@@ -4352,6 +4351,7 @@ int iscsit_close_session(struct iscsi_session *sess)
iscsit_stop_time2retain_timer(sess);
spin_unlock_bh(&se_tpg->session_lock);
+ target_sysfs_remove_session(sess->se_sess);
/*
* transport_deregister_session_configfs() will clear the
* struct se_node_acl->nacl_sess pointer now as a iscsi_np process context
@@ -4397,7 +4397,6 @@ int iscsit_close_session(struct iscsi_session *sess)
pr_debug("Decremented number of active iSCSI Sessions on"
" iSCSI TPG: %hu to %u\n", tpg->tpgt, tpg->nsessions);
- ida_free(&sess_ida, sess->session_index);
kfree(sess->sess_ops);
sess->sess_ops = NULL;
spin_unlock_bh(&se_tpg->session_lock);
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index f640e7a..c40cff1 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1344,9 +1344,7 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
static u32 lio_sess_get_index(struct se_session *se_sess)
{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
- return sess->session_index;
+ return se_sess->sid;
}
static int lio_queue_data_in(struct se_cmd *se_cmd)
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index f533308..a0ea60f 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -257,7 +257,6 @@ static int iscsi_login_zero_tsih_s1(
{
struct iscsi_session *sess = NULL;
struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;
- int ret;
sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);
if (!sess) {
@@ -291,15 +290,6 @@ static int iscsi_login_zero_tsih_s1(
timer_setup(&sess->time2retain_timer,
iscsit_handle_time2retain_timeout, 0);
- ret = ida_alloc(&sess_ida, GFP_KERNEL);
- if (ret < 0) {
- pr_err("Session ID allocation failed %d\n", ret);
- iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
- ISCSI_LOGIN_STATUS_NO_RESOURCES);
- goto free_sess;
- }
-
- sess->session_index = ret;
sess->creation_time = get_jiffies_64();
/*
* The FFP CmdSN window values will be allocated from the TPG's
@@ -313,7 +303,7 @@ static int iscsi_login_zero_tsih_s1(
ISCSI_LOGIN_STATUS_NO_RESOURCES);
pr_err("Unable to allocate memory for"
" struct iscsi_sess_ops.\n");
- goto free_id;
+ goto free_ops;
}
sess->se_sess = transport_alloc_session(TARGET_PROT_NORMAL);
@@ -327,8 +317,6 @@ static int iscsi_login_zero_tsih_s1(
free_ops:
kfree(sess->sess_ops);
-free_id:
- ida_free(&sess_ida, sess->session_index);
free_sess:
kfree(sess);
conn->sess = NULL;
@@ -1182,8 +1170,8 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn,
if (!zero_tsih || !conn->sess)
goto old_sess_out;
+ target_sysfs_remove_session(conn->sess->se_sess);
transport_free_session(conn->sess->se_sess);
- ida_free(&sess_ida, conn->sess->session_index);
kfree(conn->sess->sess_ops);
kfree(conn->sess);
conn->sess = NULL;
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index dce2fe2..298c8a5 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -359,6 +359,13 @@ static int iscsi_target_do_tx_login_io(struct iscsi_conn *conn, struct iscsi_log
ISCSI_LOGIN_STATUS_NO_RESOURCES);
return -1;
}
+
+ if (target_sysfs_add_session(&conn->tpg->tpg_se_tpg,
+ conn->sess->se_sess)) {
+ iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+ ISCSI_LOGIN_STATUS_NO_RESOURCES);
+ return -1;
+ }
}
if (conn->conn_transport->iscsit_put_login_tx(conn, login,
@@ -1281,6 +1288,7 @@ int iscsi_target_locate_portal(
ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size);
if (ret < 0)
goto return_oom;
+ sess->se_sess->tfo = &iscsi_ops;
if (conn->tpg != iscsit_global->discovery_tpg) {
if (iscsi_setup_i_tpid(sess, i_buf))
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index 35e75a3..8167fdc 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -630,8 +630,7 @@ static ssize_t iscsi_stat_sess_indx_show(struct config_item *item, char *page)
if (se_sess) {
sess = se_sess->fabric_sess_ptr;
if (sess)
- ret = snprintf(page, PAGE_SIZE, "%u\n",
- sess->session_index);
+ ret = snprintf(page, PAGE_SIZE, "%u\n", se_sess->sid);
}
spin_unlock_bh(&se_nacl->nacl_sess_lock);
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index a49d371..aeabb83 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -657,8 +657,6 @@ struct iscsi_session {
/* LIO specific session ID */
u32 sid;
char auth_type[8];
- /* unique within the target */
- int session_index;
/* Used for session reference counting */
int session_usage_count;
int session_waiting_on_uc;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 11/11] target: drop sess_get_index
2020-04-28 6:10 ` Mike Christie
@ 2020-04-28 6:11 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
LIO now handles session id allocation so drop the callout.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 15 ---------------
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 6 ------
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 7 -------
drivers/target/iscsi/iscsi_target_configfs.c | 6 ------
drivers/target/loopback/tcm_loop.c | 6 ------
drivers/target/sbp/sbp_target.c | 6 ------
drivers/target/target_core_configfs.c | 4 ----
drivers/target/target_core_stat.c | 5 +----
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 7 -------
drivers/usb/gadget/function/f_tcm.c | 6 ------
drivers/vhost/scsi.c | 6 ------
drivers/xen/xen-scsiback.c | 6 ------
include/target/target_core_fabric.h | 1 -
14 files changed, 1 insertion(+), 81 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 10b6a02..90c3a3d 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3356,20 +3356,6 @@ static void srpt_close_session(struct se_session *se_sess)
srpt_disconnect_ch_sync(ch);
}
-/**
- * srpt_sess_get_index - return the value of scsiAttIntrPortIndex (SCSI-MIB)
- * @se_sess: SCSI target session.
- *
- * A quote from RFC 4455 (SCSI-MIB) about this MIB object:
- * This object represents an arbitrary integer used to uniquely identify a
- * particular attached remote initiator port to a particular SCSI target port
- * within a particular SCSI target device within a particular SCSI instance.
- */
-static u32 srpt_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static void srpt_set_default_node_attrs(struct se_node_acl *nacl)
{
}
@@ -3846,7 +3832,6 @@ static ssize_t srpt_wwn_version_show(struct config_item *item, char *buf)
.release_cmd = srpt_release_cmd,
.check_stop_free = srpt_check_stop_free,
.close_session = srpt_close_session,
- .sess_get_index = srpt_sess_get_index,
.write_pending = srpt_write_pending,
.set_default_node_attributes = srpt_set_default_node_attrs,
.get_cmd_state = srpt_get_tcm_cmd_state,
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index 20c750f..5e0ef6f 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -3744,11 +3744,6 @@ static void ibmvscsis_release_cmd(struct se_cmd *se_cmd)
spin_unlock_bh(&vscsi->intr_lock);
}
-static u32 ibmvscsis_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int ibmvscsis_write_pending(struct se_cmd *se_cmd)
{
struct ibmvscsis_cmd *cmd = container_of(se_cmd, struct ibmvscsis_cmd,
@@ -4039,7 +4034,6 @@ static ssize_t ibmvscsis_tpg_enable_store(struct config_item *item,
.tpg_get_inst_index = ibmvscsis_tpg_get_inst_index,
.check_stop_free = ibmvscsis_check_stop_free,
.release_cmd = ibmvscsis_release_cmd,
- .sess_get_index = ibmvscsis_sess_get_index,
.write_pending = ibmvscsis_write_pending,
.set_default_node_attributes = ibmvscsis_set_default_node_attrs,
.get_cmd_state = ibmvscsis_get_cmd_state,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 43fcf81..a358d5c 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -354,11 +354,6 @@ static void tcm_qla2xxx_close_session(struct se_session *se_sess)
tcm_qla2xxx_put_sess(sess);
}
-static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
{
struct qla_tgt_cmd *cmd = container_of(se_cmd,
@@ -1832,7 +1827,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.check_stop_free = tcm_qla2xxx_check_stop_free,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
- .sess_get_index = tcm_qla2xxx_sess_get_index,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
@@ -1871,7 +1865,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.check_stop_free = tcm_qla2xxx_check_stop_free,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
- .sess_get_index = tcm_qla2xxx_sess_get_index,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index c40cff1..0b98245 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1342,11 +1342,6 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
return cmd->i_state;
}
-static u32 lio_sess_get_index(struct se_session *se_sess)
-{
- return se_sess->sid;
-}
-
static int lio_queue_data_in(struct se_cmd *se_cmd)
{
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1527,7 +1522,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
.check_stop_free = lio_check_stop_free,
.release_cmd = lio_release_cmd,
.close_session = lio_tpg_close_session,
- .sess_get_index = lio_sess_get_index,
.write_pending = lio_write_pending,
.set_default_node_attributes = lio_set_default_node_attributes,
.get_cmd_state = iscsi_get_cmd_state,
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 7ea0738..d4c59fa 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -512,11 +512,6 @@ static u32 tcm_loop_get_inst_index(struct se_portal_group *se_tpg)
return 1;
}
-static u32 tcm_loop_sess_get_index(struct se_session *se_sess)
-{
- return 1;
-}
-
static void tcm_loop_set_default_node_attributes(struct se_node_acl *se_acl)
{
return;
@@ -1153,7 +1148,6 @@ static ssize_t tcm_loop_wwn_version_show(struct config_item *item, char *page)
.tpg_get_inst_index = tcm_loop_get_inst_index,
.check_stop_free = tcm_loop_check_stop_free,
.release_cmd = tcm_loop_release_cmd,
- .sess_get_index = tcm_loop_sess_get_index,
.write_pending = tcm_loop_write_pending,
.set_default_node_attributes = tcm_loop_set_default_node_attributes,
.get_cmd_state = tcm_loop_get_cmd_state,
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 0eb1072..1adbe4c 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1713,11 +1713,6 @@ static void sbp_release_cmd(struct se_cmd *se_cmd)
sbp_free_request(req);
}
-static u32 sbp_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int sbp_write_pending(struct se_cmd *se_cmd)
{
struct sbp_target_request *req = container_of(se_cmd,
@@ -2314,7 +2309,6 @@ static ssize_t sbp_tpg_attrib_max_logins_per_lun_store(struct config_item *item,
.tpg_check_prod_mode_write_protect = sbp_check_false,
.tpg_get_inst_index = sbp_tpg_get_inst_index,
.release_cmd = sbp_release_cmd,
- .sess_get_index = sbp_sess_get_index,
.write_pending = sbp_write_pending,
.set_default_node_attributes = sbp_set_default_node_attrs,
.get_cmd_state = sbp_get_cmd_state,
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index c557deb..62967fe 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -400,10 +400,6 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
pr_err("Missing tfo->release_cmd()\n");
return -EINVAL;
}
- if (!tfo->sess_get_index) {
- pr_err("Missing tfo->sess_get_index()\n");
- return -EINVAL;
- }
if (!tfo->write_pending) {
pr_err("Missing tfo->write_pending()\n");
return -EINVAL;
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index 69ba7c3..7121514 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -1264,7 +1264,6 @@ static ssize_t target_stat_iport_indx_show(struct config_item *item,
struct se_lun_acl *lacl = iport_to_lacl(item);
struct se_node_acl *nacl = lacl->se_lun_nacl;
struct se_session *se_sess;
- struct se_portal_group *tpg;
ssize_t ret;
spin_lock_irq(&nacl->nacl_sess_lock);
@@ -1274,10 +1273,8 @@ static ssize_t target_stat_iport_indx_show(struct config_item *item,
return -ENODEV;
}
- tpg = nacl->se_tpg;
/* scsiAttIntrPortIndex */
- ret = snprintf(page, PAGE_SIZE, "%u\n",
- tpg->se_tpg_tfo->sess_get_index(se_sess));
+ ret = snprintf(page, PAGE_SIZE, "%u\n", se_sess->sid);
spin_unlock_irq(&nacl->nacl_sess_lock);
return ret;
}
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 870b7bb..747824f 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -426,7 +426,6 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
.check_stop_free = ft_check_stop_free,
.release_cmd = ft_release_cmd,
.close_session = ft_sess_close,
- .sess_get_index = ft_sess_get_index,
.write_pending = ft_write_pending,
.set_default_node_attributes = ft_set_default_node_attr,
.get_cmd_state = ft_get_cmd_state,
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 6e172ff..6b58e1a 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -331,13 +331,6 @@ void ft_sess_close(struct se_session *se_sess)
synchronize_rcu(); /* let transport deregister happen */
}
-u32 ft_sess_get_index(struct se_session *se_sess)
-{
- struct ft_sess *sess = se_sess->fabric_sess_ptr;
-
- return sess->port_id; /* XXX TBD probably not what is needed */
-}
-
u32 ft_sess_get_port_name(struct se_session *se_sess,
unsigned char *buf, u32 len)
{
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index e6d7232..1f10ddd 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1287,11 +1287,6 @@ static void usbg_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_sess, se_cmd);
}
-static u32 usbg_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static void usbg_set_default_node_attrs(struct se_node_acl *nacl)
{
}
@@ -1720,7 +1715,6 @@ static int usbg_check_stop_free(struct se_cmd *se_cmd)
.tpg_check_prod_mode_write_protect = usbg_check_false,
.tpg_get_inst_index = usbg_tpg_get_inst_index,
.release_cmd = usbg_release_cmd,
- .sess_get_index = usbg_sess_get_index,
.write_pending = usbg_send_write_request,
.set_default_node_attributes = usbg_set_default_node_attrs,
.get_cmd_state = usbg_get_cmd_state,
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 182d2ea..7526f35 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -340,11 +340,6 @@ static void vhost_scsi_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_sess, se_cmd);
}
-static u32 vhost_scsi_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int vhost_scsi_write_pending(struct se_cmd *se_cmd)
{
/* Go ahead and process the write immediately */
@@ -2304,7 +2299,6 @@ static void vhost_scsi_drop_tport(struct se_wwn *wwn)
.tpg_get_inst_index = vhost_scsi_tpg_get_inst_index,
.release_cmd = vhost_scsi_release_cmd,
.check_stop_free = vhost_scsi_check_stop_free,
- .sess_get_index = vhost_scsi_sess_get_index,
.write_pending = vhost_scsi_write_pending,
.set_default_node_attributes = vhost_scsi_set_default_node_attrs,
.get_cmd_state = vhost_scsi_get_cmd_state,
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 67b4092..b107cdd 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1391,11 +1391,6 @@ static void scsiback_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_cmd->se_sess, se_cmd);
}
-static u32 scsiback_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int scsiback_write_pending(struct se_cmd *se_cmd)
{
/* Go ahead and process the write immediately */
@@ -1825,7 +1820,6 @@ static int scsiback_check_false(struct se_portal_group *se_tpg)
.tpg_get_inst_index = scsiback_tpg_get_inst_index,
.check_stop_free = scsiback_check_stop_free,
.release_cmd = scsiback_release_cmd,
- .sess_get_index = scsiback_sess_get_index,
.write_pending = scsiback_write_pending,
.set_default_node_attributes = scsiback_set_default_node_attrs,
.get_cmd_state = scsiback_get_cmd_state,
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index be43180..3af7dc6 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -66,7 +66,6 @@ struct target_core_fabric_ops {
int (*check_stop_free)(struct se_cmd *);
void (*release_cmd)(struct se_cmd *);
void (*close_session)(struct se_session *);
- u32 (*sess_get_index)(struct se_session *);
int (*write_pending)(struct se_cmd *);
void (*set_default_node_attributes)(struct se_node_acl *);
int (*get_cmd_state)(struct se_cmd *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 11/11] target: drop sess_get_index
@ 2020-04-28 6:11 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 6:11 UTC (permalink / raw)
To: bvanassche, bstroesser, martin.petersen, linux-scsi, target-devel
Cc: Mike Christie
LIO now handles session id allocation so drop the callout.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 15 ---------------
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 6 ------
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 7 -------
drivers/target/iscsi/iscsi_target_configfs.c | 6 ------
drivers/target/loopback/tcm_loop.c | 6 ------
drivers/target/sbp/sbp_target.c | 6 ------
drivers/target/target_core_configfs.c | 4 ----
drivers/target/target_core_stat.c | 5 +----
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 7 -------
drivers/usb/gadget/function/f_tcm.c | 6 ------
drivers/vhost/scsi.c | 6 ------
drivers/xen/xen-scsiback.c | 6 ------
include/target/target_core_fabric.h | 1 -
14 files changed, 1 insertion(+), 81 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 10b6a02..90c3a3d 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3356,20 +3356,6 @@ static void srpt_close_session(struct se_session *se_sess)
srpt_disconnect_ch_sync(ch);
}
-/**
- * srpt_sess_get_index - return the value of scsiAttIntrPortIndex (SCSI-MIB)
- * @se_sess: SCSI target session.
- *
- * A quote from RFC 4455 (SCSI-MIB) about this MIB object:
- * This object represents an arbitrary integer used to uniquely identify a
- * particular attached remote initiator port to a particular SCSI target port
- * within a particular SCSI target device within a particular SCSI instance.
- */
-static u32 srpt_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static void srpt_set_default_node_attrs(struct se_node_acl *nacl)
{
}
@@ -3846,7 +3832,6 @@ static ssize_t srpt_wwn_version_show(struct config_item *item, char *buf)
.release_cmd = srpt_release_cmd,
.check_stop_free = srpt_check_stop_free,
.close_session = srpt_close_session,
- .sess_get_index = srpt_sess_get_index,
.write_pending = srpt_write_pending,
.set_default_node_attributes = srpt_set_default_node_attrs,
.get_cmd_state = srpt_get_tcm_cmd_state,
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index 20c750f..5e0ef6f 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -3744,11 +3744,6 @@ static void ibmvscsis_release_cmd(struct se_cmd *se_cmd)
spin_unlock_bh(&vscsi->intr_lock);
}
-static u32 ibmvscsis_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int ibmvscsis_write_pending(struct se_cmd *se_cmd)
{
struct ibmvscsis_cmd *cmd = container_of(se_cmd, struct ibmvscsis_cmd,
@@ -4039,7 +4034,6 @@ static ssize_t ibmvscsis_tpg_enable_store(struct config_item *item,
.tpg_get_inst_index = ibmvscsis_tpg_get_inst_index,
.check_stop_free = ibmvscsis_check_stop_free,
.release_cmd = ibmvscsis_release_cmd,
- .sess_get_index = ibmvscsis_sess_get_index,
.write_pending = ibmvscsis_write_pending,
.set_default_node_attributes = ibmvscsis_set_default_node_attrs,
.get_cmd_state = ibmvscsis_get_cmd_state,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 43fcf81..a358d5c 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -354,11 +354,6 @@ static void tcm_qla2xxx_close_session(struct se_session *se_sess)
tcm_qla2xxx_put_sess(sess);
}
-static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
{
struct qla_tgt_cmd *cmd = container_of(se_cmd,
@@ -1832,7 +1827,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.check_stop_free = tcm_qla2xxx_check_stop_free,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
- .sess_get_index = tcm_qla2xxx_sess_get_index,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
@@ -1871,7 +1865,6 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
.check_stop_free = tcm_qla2xxx_check_stop_free,
.release_cmd = tcm_qla2xxx_release_cmd,
.close_session = tcm_qla2xxx_close_session,
- .sess_get_index = tcm_qla2xxx_sess_get_index,
.write_pending = tcm_qla2xxx_write_pending,
.set_default_node_attributes = tcm_qla2xxx_set_default_node_attrs,
.get_cmd_state = tcm_qla2xxx_get_cmd_state,
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index c40cff1..0b98245 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1342,11 +1342,6 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
return cmd->i_state;
}
-static u32 lio_sess_get_index(struct se_session *se_sess)
-{
- return se_sess->sid;
-}
-
static int lio_queue_data_in(struct se_cmd *se_cmd)
{
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1527,7 +1522,6 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
.check_stop_free = lio_check_stop_free,
.release_cmd = lio_release_cmd,
.close_session = lio_tpg_close_session,
- .sess_get_index = lio_sess_get_index,
.write_pending = lio_write_pending,
.set_default_node_attributes = lio_set_default_node_attributes,
.get_cmd_state = iscsi_get_cmd_state,
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 7ea0738..d4c59fa 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -512,11 +512,6 @@ static u32 tcm_loop_get_inst_index(struct se_portal_group *se_tpg)
return 1;
}
-static u32 tcm_loop_sess_get_index(struct se_session *se_sess)
-{
- return 1;
-}
-
static void tcm_loop_set_default_node_attributes(struct se_node_acl *se_acl)
{
return;
@@ -1153,7 +1148,6 @@ static ssize_t tcm_loop_wwn_version_show(struct config_item *item, char *page)
.tpg_get_inst_index = tcm_loop_get_inst_index,
.check_stop_free = tcm_loop_check_stop_free,
.release_cmd = tcm_loop_release_cmd,
- .sess_get_index = tcm_loop_sess_get_index,
.write_pending = tcm_loop_write_pending,
.set_default_node_attributes = tcm_loop_set_default_node_attributes,
.get_cmd_state = tcm_loop_get_cmd_state,
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 0eb1072..1adbe4c 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1713,11 +1713,6 @@ static void sbp_release_cmd(struct se_cmd *se_cmd)
sbp_free_request(req);
}
-static u32 sbp_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int sbp_write_pending(struct se_cmd *se_cmd)
{
struct sbp_target_request *req = container_of(se_cmd,
@@ -2314,7 +2309,6 @@ static ssize_t sbp_tpg_attrib_max_logins_per_lun_store(struct config_item *item,
.tpg_check_prod_mode_write_protect = sbp_check_false,
.tpg_get_inst_index = sbp_tpg_get_inst_index,
.release_cmd = sbp_release_cmd,
- .sess_get_index = sbp_sess_get_index,
.write_pending = sbp_write_pending,
.set_default_node_attributes = sbp_set_default_node_attrs,
.get_cmd_state = sbp_get_cmd_state,
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index c557deb..62967fe 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -400,10 +400,6 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
pr_err("Missing tfo->release_cmd()\n");
return -EINVAL;
}
- if (!tfo->sess_get_index) {
- pr_err("Missing tfo->sess_get_index()\n");
- return -EINVAL;
- }
if (!tfo->write_pending) {
pr_err("Missing tfo->write_pending()\n");
return -EINVAL;
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index 69ba7c3..7121514 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -1264,7 +1264,6 @@ static ssize_t target_stat_iport_indx_show(struct config_item *item,
struct se_lun_acl *lacl = iport_to_lacl(item);
struct se_node_acl *nacl = lacl->se_lun_nacl;
struct se_session *se_sess;
- struct se_portal_group *tpg;
ssize_t ret;
spin_lock_irq(&nacl->nacl_sess_lock);
@@ -1274,10 +1273,8 @@ static ssize_t target_stat_iport_indx_show(struct config_item *item,
return -ENODEV;
}
- tpg = nacl->se_tpg;
/* scsiAttIntrPortIndex */
- ret = snprintf(page, PAGE_SIZE, "%u\n",
- tpg->se_tpg_tfo->sess_get_index(se_sess));
+ ret = snprintf(page, PAGE_SIZE, "%u\n", se_sess->sid);
spin_unlock_irq(&nacl->nacl_sess_lock);
return ret;
}
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 870b7bb..747824f 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -426,7 +426,6 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
.check_stop_free = ft_check_stop_free,
.release_cmd = ft_release_cmd,
.close_session = ft_sess_close,
- .sess_get_index = ft_sess_get_index,
.write_pending = ft_write_pending,
.set_default_node_attributes = ft_set_default_node_attr,
.get_cmd_state = ft_get_cmd_state,
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 6e172ff..6b58e1a 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -331,13 +331,6 @@ void ft_sess_close(struct se_session *se_sess)
synchronize_rcu(); /* let transport deregister happen */
}
-u32 ft_sess_get_index(struct se_session *se_sess)
-{
- struct ft_sess *sess = se_sess->fabric_sess_ptr;
-
- return sess->port_id; /* XXX TBD probably not what is needed */
-}
-
u32 ft_sess_get_port_name(struct se_session *se_sess,
unsigned char *buf, u32 len)
{
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index e6d7232..1f10ddd 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1287,11 +1287,6 @@ static void usbg_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_sess, se_cmd);
}
-static u32 usbg_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static void usbg_set_default_node_attrs(struct se_node_acl *nacl)
{
}
@@ -1720,7 +1715,6 @@ static int usbg_check_stop_free(struct se_cmd *se_cmd)
.tpg_check_prod_mode_write_protect = usbg_check_false,
.tpg_get_inst_index = usbg_tpg_get_inst_index,
.release_cmd = usbg_release_cmd,
- .sess_get_index = usbg_sess_get_index,
.write_pending = usbg_send_write_request,
.set_default_node_attributes = usbg_set_default_node_attrs,
.get_cmd_state = usbg_get_cmd_state,
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 182d2ea..7526f35 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -340,11 +340,6 @@ static void vhost_scsi_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_sess, se_cmd);
}
-static u32 vhost_scsi_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int vhost_scsi_write_pending(struct se_cmd *se_cmd)
{
/* Go ahead and process the write immediately */
@@ -2304,7 +2299,6 @@ static void vhost_scsi_drop_tport(struct se_wwn *wwn)
.tpg_get_inst_index = vhost_scsi_tpg_get_inst_index,
.release_cmd = vhost_scsi_release_cmd,
.check_stop_free = vhost_scsi_check_stop_free,
- .sess_get_index = vhost_scsi_sess_get_index,
.write_pending = vhost_scsi_write_pending,
.set_default_node_attributes = vhost_scsi_set_default_node_attrs,
.get_cmd_state = vhost_scsi_get_cmd_state,
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 67b4092..b107cdd 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1391,11 +1391,6 @@ static void scsiback_release_cmd(struct se_cmd *se_cmd)
target_free_tag(se_cmd->se_sess, se_cmd);
}
-static u32 scsiback_sess_get_index(struct se_session *se_sess)
-{
- return 0;
-}
-
static int scsiback_write_pending(struct se_cmd *se_cmd)
{
/* Go ahead and process the write immediately */
@@ -1825,7 +1820,6 @@ static int scsiback_check_false(struct se_portal_group *se_tpg)
.tpg_get_inst_index = scsiback_tpg_get_inst_index,
.check_stop_free = scsiback_check_stop_free,
.release_cmd = scsiback_release_cmd,
- .sess_get_index = scsiback_sess_get_index,
.write_pending = scsiback_write_pending,
.set_default_node_attributes = scsiback_set_default_node_attrs,
.get_cmd_state = scsiback_get_cmd_state,
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index be43180..3af7dc6 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -66,7 +66,6 @@ struct target_core_fabric_ops {
int (*check_stop_free)(struct se_cmd *);
void (*release_cmd)(struct se_cmd *);
void (*close_session)(struct se_session *);
- u32 (*sess_get_index)(struct se_session *);
int (*write_pending)(struct se_cmd *);
void (*set_default_node_attributes)(struct se_node_acl *);
int (*get_cmd_state)(struct se_cmd *);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH 02/11] target: separate acl name from port ids
2020-04-28 6:11 ` Mike Christie
@ 2020-04-28 16:14 ` Bart Van Assche
-1 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:14 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> The PGR code assumes the ACL name is going to be based on the SPC4
> transportID type of values. The problem is that for iSCSI we have an
> extra session id as part of the SCSI port id and some fabric modules
> support or would like to support non transportID values for the ACL
> name. For example, iSCSI and SRP would like to use the source address
> for the ACL name, but that is not a valud transportID value that you
> can get in a PGR request.
>
> This patch adds a new transport_id struct which maps to the SPC
> transportID. In the future will be used for PGR commands instead of
> the ACL name. In this patchset, it is used to export the initiator
> info in the session's sysfs dir, so tools can disply the info and
^^^^^^
display?
> daemons that execute commands like PGRs in userspace can build a
> session id to I_T nexus mapping.
[ ... ]
> --- a/drivers/target/loopback/tcm_loop.c
> +++ b/drivers/target/loopback/tcm_loop.c
> @@ -725,10 +725,11 @@ static int tcm_loop_alloc_sess_cb(struct se_portal_group *se_tpg,
>
> static int tcm_loop_make_nexus(
> struct tcm_loop_tpg *tl_tpg,
> - const char *name)
> + char *name)
> {
What needs to be changed to keep the type of the argument as 'const char
*'? How about removing the target_cp_transport_id() call from
target_setup_session() and making all transports allocate the transport
ID dynamically such that target_setup_session() does not have to
duplicate the transport ID?
> +struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *src)
> +{
> + struct t10_transport_id *dst;
> +
> + dst = kzalloc(sizeof(*dst), GFP_KERNEL);
> + if (!dst)
> + return NULL;
> + dst->proto = src->proto;
> +
> + dst->name = kstrdup(src->name, GFP_KERNEL);
> + if (!dst->name)
> + goto free_tpid;
> +
> + if (src->session_id) {
> + dst->session_id = kstrdup(src->session_id, GFP_KERNEL);
> + if (!dst->session_id)
> + goto free_name;
> + }
> +
> + return dst;
> +
> +free_name:
> + kfree(dst->name);
> +free_tpid:
> + kfree(dst);
> + return NULL;
> +}
> +EXPORT_SYMBOL(target_cp_transport_id);
How about changing "cp" into "dup" in the name of the
target_cp_transport_id() function?
> -static int scsiback_make_nexus(struct scsiback_tpg *tpg,
> - const char *name)
> +static int scsiback_make_nexus(struct scsiback_tpg *tpg, char *name)
> {
Also for this function, is it possible to keep the type of 'name' as
'const char *'?
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 02/11] target: separate acl name from port ids
@ 2020-04-28 16:14 ` Bart Van Assche
0 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:14 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> The PGR code assumes the ACL name is going to be based on the SPC4
> transportID type of values. The problem is that for iSCSI we have an
> extra session id as part of the SCSI port id and some fabric modules
> support or would like to support non transportID values for the ACL
> name. For example, iSCSI and SRP would like to use the source address
> for the ACL name, but that is not a valud transportID value that you
> can get in a PGR request.
>
> This patch adds a new transport_id struct which maps to the SPC
> transportID. In the future will be used for PGR commands instead of
> the ACL name. In this patchset, it is used to export the initiator
> info in the session's sysfs dir, so tools can disply the info and
^^^^^^
display?
> daemons that execute commands like PGRs in userspace can build a
> session id to I_T nexus mapping.
[ ... ]
> --- a/drivers/target/loopback/tcm_loop.c
> +++ b/drivers/target/loopback/tcm_loop.c
> @@ -725,10 +725,11 @@ static int tcm_loop_alloc_sess_cb(struct se_portal_group *se_tpg,
>
> static int tcm_loop_make_nexus(
> struct tcm_loop_tpg *tl_tpg,
> - const char *name)
> + char *name)
> {
What needs to be changed to keep the type of the argument as 'const char
*'? How about removing the target_cp_transport_id() call from
target_setup_session() and making all transports allocate the transport
ID dynamically such that target_setup_session() does not have to
duplicate the transport ID?
> +struct t10_transport_id *target_cp_transport_id(struct t10_transport_id *src)
> +{
> + struct t10_transport_id *dst;
> +
> + dst = kzalloc(sizeof(*dst), GFP_KERNEL);
> + if (!dst)
> + return NULL;
> + dst->proto = src->proto;
> +
> + dst->name = kstrdup(src->name, GFP_KERNEL);
> + if (!dst->name)
> + goto free_tpid;
> +
> + if (src->session_id) {
> + dst->session_id = kstrdup(src->session_id, GFP_KERNEL);
> + if (!dst->session_id)
> + goto free_name;
> + }
> +
> + return dst;
> +
> +free_name:
> + kfree(dst->name);
> +free_tpid:
> + kfree(dst);
> + return NULL;
> +}
> +EXPORT_SYMBOL(target_cp_transport_id);
How about changing "cp" into "dup" in the name of the
target_cp_transport_id() function?
> -static int scsiback_make_nexus(struct scsiback_tpg *tpg,
> - const char *name)
> +static int scsiback_make_nexus(struct scsiback_tpg *tpg, char *name)
> {
Also for this function, is it possible to keep the type of 'name' as
'const char *'?
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 06/11] target: drop sess_get_initiator_sid
2020-04-28 6:11 ` Mike Christie
@ 2020-04-28 16:25 ` Bart Van Assche
-1 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:25 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> sess_get_initiator_sid is no longer used. Drop it.
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 06/11] target: drop sess_get_initiator_sid
@ 2020-04-28 16:25 ` Bart Van Assche
0 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:25 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> sess_get_initiator_sid is no longer used. Drop it.
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] target: add sysfs support
2020-04-28 6:11 ` Mike Christie
@ 2020-04-28 16:29 ` Bart Van Assche
-1 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:29 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> @@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
>
> target_init_dbroot();
>
> + tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
> + if (!tcm_core_kobj)
> + goto out;
Is an ack from Greg KH required when adding a new directory under
/sys/kernel?
Should a file be added under Documentation/ABI/stable that documents the
new sysfs attributes?
Otherwise this patch looks fine to me.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] target: add sysfs support
@ 2020-04-28 16:29 ` Bart Van Assche
0 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:29 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> @@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
>
> target_init_dbroot();
>
> + tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
> + if (!tcm_core_kobj)
> + goto out;
Is an ack from Greg KH required when adding a new directory under
/sys/kernel?
Should a file be added under Documentation/ABI/stable that documents the
new sysfs attributes?
Otherwise this patch looks fine to me.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] target: add sysfs support
2020-04-28 16:29 ` Bart Van Assche
@ 2020-04-28 16:33 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 16:33 UTC (permalink / raw)
To: Bart Van Assche, bstroesser, martin.petersen, linux-scsi, target-devel
On 4/28/20 11:29 AM, Bart Van Assche wrote:
> On 2020-04-27 23:11, Mike Christie wrote:
>> @@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
>>
>> target_init_dbroot();
>>
>> + tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
>> + if (!tcm_core_kobj)
>> + goto out;
>
> Is an ack from Greg KH required when adding a new directory under
> /sys/kernel?
I'm not sure. When I resend with your other comments handled, I will cc him.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 07/11] target: add sysfs support
@ 2020-04-28 16:33 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 16:33 UTC (permalink / raw)
To: Bart Van Assche, bstroesser, martin.petersen, linux-scsi, target-devel
On 4/28/20 11:29 AM, Bart Van Assche wrote:
> On 2020-04-27 23:11, Mike Christie wrote:
>> @@ -3536,6 +3551,15 @@ static int __init target_core_init_configfs(void)
>>
>> target_init_dbroot();
>>
>> + tcm_core_kobj = kobject_create_and_add("scsi_target", NULL);
>> + if (!tcm_core_kobj)
>> + goto out;
>
> Is an ack from Greg KH required when adding a new directory under
> /sys/kernel?
I'm not sure. When I resend with your other comments handled, I will cc him.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] target: add sysfs session helper functions
2020-04-28 6:11 ` Mike Christie
@ 2020-04-28 16:43 ` Bart Van Assche
-1 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:43 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> + ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
> + se_sess->sid);
> + if (ret) {
> + pr_err("Could not add session%d to sysfs. Error %d.\n",
> + se_sess->sid, ret);
> + goto free_acl_name;
> + }
Has it been considered to derive the directory name for a session from
the initiator name (se_node_acl.initiatorname-%d)? Would that be more
convenient for users than the session-%d naming scheme?
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] target: add sysfs session helper functions
@ 2020-04-28 16:43 ` Bart Van Assche
0 siblings, 0 replies; 36+ messages in thread
From: Bart Van Assche @ 2020-04-28 16:43 UTC (permalink / raw)
To: Mike Christie, bstroesser, martin.petersen, linux-scsi, target-devel
On 2020-04-27 23:11, Mike Christie wrote:
> + ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
> + se_sess->sid);
> + if (ret) {
> + pr_err("Could not add session%d to sysfs. Error %d.\n",
> + se_sess->sid, ret);
> + goto free_acl_name;
> + }
Has it been considered to derive the directory name for a session from
the initiator name (se_node_acl.initiatorname-%d)? Would that be more
convenient for users than the session-%d naming scheme?
Thanks,
Bart.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] target: add sysfs session helper functions
2020-04-28 16:43 ` Bart Van Assche
@ 2020-04-28 17:06 ` Mike Christie
-1 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 17:06 UTC (permalink / raw)
To: Bart Van Assche, bstroesser, martin.petersen, linux-scsi, target-devel
On 4/28/20 11:43 AM, Bart Van Assche wrote:
> On 2020-04-27 23:11, Mike Christie wrote:
>> + ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
>> + se_sess->sid);
>> + if (ret) {
>> + pr_err("Could not add session%d to sysfs. Error %d.\n",
>> + se_sess->sid, ret);
>> + goto free_acl_name;
>> + }
>
> Has it been considered to derive the directory name for a session from
> the initiator name (se_node_acl.initiatorname-%d)? Would that be more
> convenient for users than the session-%d naming scheme?
It seems nicer. I can do the initaitorname-%d.
It will also handle the iscsi case where we have multiple sessions from
the same initiator to the same target port.
>
> Thanks,
>
> Bart.
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 08/11] target: add sysfs session helper functions
@ 2020-04-28 17:06 ` Mike Christie
0 siblings, 0 replies; 36+ messages in thread
From: Mike Christie @ 2020-04-28 17:06 UTC (permalink / raw)
To: Bart Van Assche, bstroesser, martin.petersen, linux-scsi, target-devel
On 4/28/20 11:43 AM, Bart Van Assche wrote:
> On 2020-04-27 23:11, Mike Christie wrote:
>> + ret = kobject_add(&se_sess->kobj, se_tpg->sessions_kobj, "session-%d",
>> + se_sess->sid);
>> + if (ret) {
>> + pr_err("Could not add session%d to sysfs. Error %d.\n",
>> + se_sess->sid, ret);
>> + goto free_acl_name;
>> + }
>
> Has it been considered to derive the directory name for a session from
> the initiator name (se_node_acl.initiatorname-%d)? Would that be more
> convenient for users than the session-%d naming scheme?
It seems nicer. I can do the initaitorname-%d.
It will also handle the iscsi case where we have multiple sessions from
the same initiator to the same target port.
>
> Thanks,
>
> Bart.
>
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2020-04-28 17:06 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 03/11] iscsi target: setup transport_id Mike Christie
2020-04-28 6:11 ` 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
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.