Skip to contentSkip to conversation

nvmet: implement unique discovery NQN

PATCH Superseded [email protected] 4 participants 5 messages Dec 11, 2023 – Dec 12, 2023

Subsystems (2)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvmet: implement unique discovery NQN

From: Hannes Reinecke <[email protected]>

Add a configfs attribute 'discovery_nqn' in the 'nvmet' configfs directory to specify the unique discovery NQN.

---
 drivers/nvme/target/configfs.c | 45 ++++++++++++++++++++++++++++++++++
 drivers/nvme/target/core.c     |  7 ++++++
 2 files changed, 52 insertions(+)
drivers/nvme/target/configfs.c +45 -0
index d937fe05129e..88911d0cd057 100644
@@ -1587,6 +1587,11 @@ static struct config_group *nvmet_subsys_make(struct config_group *group,
 		return ERR_PTR(-EINVAL);
 	}
 
+	if (sysfs_streq(name, nvmet_disc_subsys->subsysnqn)) {
+		pr_err("can't create subsystem using unique discovery NQN\n");
+		return ERR_PTR(-EINVAL);
+	}
+
 	subsys = nvmet_subsys_alloc(name, NVME_NQN_NVME);
 	if (IS_ERR(subsys))
 		return ERR_CAST(subsys);
@@ -2131,7 +2136,47 @@ static const struct config_item_type nvmet_hosts_type = {
 
 static struct config_group nvmet_hosts_group;
 
+static ssize_t nvmet_root_discovery_nqn_show(struct config_item *item,
+					     char *page)
+{
+	return sprintf(page, "%s\n", nvmet_disc_subsys->subsysnqn);
+}
+
+static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,
+		const char *page, size_t count)
+{
+	size_t len;
+	struct list_head *entry;
+
+	len = strcspn(page, "\n");
+	if (!len || len > NVMF_NQN_FIELD_LEN - 1)
+		return -EINVAL;
+
+	down_write(&nvmet_config_sem);
+	list_for_each(entry, &nvmet_subsystems_group.cg_children) {
+		struct config_item *item = container_of(entry, struct config_item, ci_entry);
+		if (!strncmp(config_item_name(item), page, len)) {
+			pr_err("duplicate NQN %s\n", config_item_name(item));
+			up_write(&nvmet_config_sem);
+			return -EINVAL;
+		}
+	}
+	memset(nvmet_disc_subsys->subsysnqn, 0, NVMF_NQN_FIELD_LEN);
+	memcpy(nvmet_disc_subsys->subsysnqn, page, len);
+	up_write(&nvmet_config_sem);
+
+	return len;
+}
+
+CONFIGFS_ATTR(nvmet_root_, discovery_nqn);
+
+static struct configfs_attribute *nvmet_root_attrs[] = {
+	&nvmet_root_attr_discovery_nqn,
+	NULL,
+};
+
 static const struct config_item_type nvmet_root_type = {
+	.ct_attrs		= nvmet_root_attrs,
 	.ct_owner		= THIS_MODULE,
 };
 
drivers/nvme/target/core.c +7 -0
index 3935165048e7..9c028bbedb45 100644
@@ -1530,6 +1530,13 @@ static struct nvmet_subsys *nvmet_find_get_subsys(struct nvmet_port *port,
 	}
 
 	down_read(&nvmet_config_sem);
+	if (!strncmp(nvmet_disc_subsys->subsysnqn, subsysnqn,
+				NVMF_NQN_SIZE)) {
+		if (kref_get_unless_zero(&nvmet_disc_subsys->ref)) {
+			up_read(&nvmet_config_sem);
+			return nvmet_disc_subsys;
+		}
+	}
 	list_for_each_entry(p, &port->subsystems, entry) {
 		if (!strncmp(p->subsys->subsysnqn, subsysnqn,
 				NVMF_NQN_SIZE)) {
Signature · 1 line
2.35.3
maintainer
#1 lore raw

So it also responds for the default discovery-nqn?

Quoted 93 lines · On 12/11/23 10:10, [email protected] wrote:

From: Hannes Reinecke <[email protected]>

Add a configfs attribute 'discovery_nqn' in the 'nvmet' configfs directory to specify the unique discovery NQN.

---
  drivers/nvme/target/configfs.c | 45 ++++++++++++++++++++++++++++++++++
  drivers/nvme/target/core.c     |  7 ++++++
  2 files changed, 52 insertions(+)
drivers/nvme/target/configfs.c +45 -0
index d937fe05129e..88911d0cd057 100644
@@ -1587,6 +1587,11 @@ static struct config_group *nvmet_subsys_make(struct config_group *group,
  		return ERR_PTR(-EINVAL);
  	}
 
+	if (sysfs_streq(name, nvmet_disc_subsys->subsysnqn)) {
+		pr_err("can't create subsystem using unique discovery NQN\n");
+		return ERR_PTR(-EINVAL);
+	}
+
  	subsys = nvmet_subsys_alloc(name, NVME_NQN_NVME);
  	if (IS_ERR(subsys))
  		return ERR_CAST(subsys);
@@ -2131,7 +2136,47 @@ static const struct config_item_type nvmet_hosts_type = {
 
  static struct config_group nvmet_hosts_group;
 
+static ssize_t nvmet_root_discovery_nqn_show(struct config_item *item,
+					     char *page)
+{
+	return sprintf(page, "%s\n", nvmet_disc_subsys->subsysnqn);
+}
+
+static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,
+		const char *page, size_t count)
+{
+	size_t len;
+	struct list_head *entry;
+
+	len = strcspn(page, "\n");
+	if (!len || len > NVMF_NQN_FIELD_LEN - 1)
+		return -EINVAL;
+
+	down_write(&nvmet_config_sem);
+	list_for_each(entry, &nvmet_subsystems_group.cg_children) {
+		struct config_item *item = container_of(entry, struct config_item, ci_entry);
+		if (!strncmp(config_item_name(item), page, len)) {
+			pr_err("duplicate NQN %s\n", config_item_name(item));
+			up_write(&nvmet_config_sem);
+			return -EINVAL;
+		}
+	}
+	memset(nvmet_disc_subsys->subsysnqn, 0, NVMF_NQN_FIELD_LEN);
+	memcpy(nvmet_disc_subsys->subsysnqn, page, len);
+	up_write(&nvmet_config_sem);
+
+	return len;
+}
+
+CONFIGFS_ATTR(nvmet_root_, discovery_nqn);
+
+static struct configfs_attribute *nvmet_root_attrs[] = {
+	&nvmet_root_attr_discovery_nqn,
+	NULL,
+};
+
  static const struct config_item_type nvmet_root_type = {
+	.ct_attrs		= nvmet_root_attrs,
  	.ct_owner		= THIS_MODULE,
  };
 
drivers/nvme/target/core.c +7 -0
index 3935165048e7..9c028bbedb45 100644
@@ -1530,6 +1530,13 @@ static struct nvmet_subsys *nvmet_find_get_subsys(struct nvmet_port *port,
  	}
 
  	down_read(&nvmet_config_sem);
+	if (!strncmp(nvmet_disc_subsys->subsysnqn, subsysnqn,
+				NVMF_NQN_SIZE)) {
+		if (kref_get_unless_zero(&nvmet_disc_subsys->ref)) {
+			up_read(&nvmet_config_sem);
+			return nvmet_disc_subsys;
+		}
+	}
  	list_for_each_entry(p, &port->subsystems, entry) {
  		if (!strncmp(p->subsys->subsysnqn, subsysnqn,
  				NVMF_NQN_SIZE)) {
#2 lore raw
Quoted 2 lines · Sagi Grimberg

So it also responds for the default discovery-nqn?

yes.

Cheers,

Hannes

#3 lore raw
In reply to [email protected]
Quoted 54 lines · On 12/11/23 00:10, [email protected] wrote:

From: Hannes Reinecke <[email protected]>

Add a configfs attribute 'discovery_nqn' in the 'nvmet' configfs directory to specify the unique discovery NQN.

---
  drivers/nvme/target/configfs.c | 45 ++++++++++++++++++++++++++++++++++
  drivers/nvme/target/core.c     |  7 ++++++
  2 files changed, 52 insertions(+)
drivers/nvme/target/configfs.c +28 -0
index d937fe05129e..88911d0cd057 100644
@@ -1587,6 +1587,11 @@ static struct config_group *nvmet_subsys_make(struct config_group *group,
  		return ERR_PTR(-EINVAL);
  	}
 
+	if (sysfs_streq(name, nvmet_disc_subsys->subsysnqn)) {
+		pr_err("can't create subsystem using unique discovery NQN\n");
+		return ERR_PTR(-EINVAL);
+	}
+
  	subsys = nvmet_subsys_alloc(name, NVME_NQN_NVME);
  	if (IS_ERR(subsys))
  		return ERR_CAST(subsys);
@@ -2131,7 +2136,47 @@ static const struct config_item_type nvmet_hosts_type = {
 
  static struct config_group nvmet_hosts_group;
 
+static ssize_t nvmet_root_discovery_nqn_show(struct config_item *item,
+					     char *page)
+{
+	return sprintf(page, "%s\n", nvmet_disc_subsys->subsysnqn);
+}
+
+static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,
+		const char *page, size_t count)
+{
+	size_t len;
+	struct list_head *entry;
+
+	len = strcspn(page, "\n");
+	if (!len || len > NVMF_NQN_FIELD_LEN - 1)
+		return -EINVAL;
+
+	down_write(&nvmet_config_sem);
+	list_for_each(entry, &nvmet_subsystems_group.cg_children) {
+		struct config_item *item = container_of(entry, struct config_item, ci_entry);
+		if (!strncmp(config_item_name(item), page, len)) {
+			pr_err("duplicate NQN %s\n", config_item_name(item));
+			up_write(&nvmet_config_sem);
+			return -EINVAL;

drivers/nvme/target/configfs.c static const struct config_item_type nvmet_hosts_type = { · line 2171

Quoted 10 lines
drivers/nvme/target/configfs.c +9 -0
+		}
+	}
+	memset(nvmet_disc_subsys->subsysnqn, 0, NVMF_NQN_FIELD_LEN);
+	memcpy(nvmet_disc_subsys->subsysnqn, page, len);
+	up_write(&nvmet_config_sem);
+
+	return len;
+}
+
 

please consider something like following, it removes long line re-structures the declaration totally untested :-

drivers/nvme/target/configfs.c +0 -0
index 88911d0cd057..05d67ddfe83e 100644
@@ -2145,8 +2145,8 @@ static ssize_t 

nvmet_root_discovery_nqn_show(struct config_item *item,
 static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item, const char *page, size_t count)
 {
-       size_t len;
        struct list_head *entry;
+       size_t len;

        len = strcspn(page, "\n");
        if (!len || len > NVMF_NQN_FIELD_LEN - 1)
@@ -2154,7 +2154,9 @@ static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,

        down_write(&nvmet_config_sem);
        list_for_each(entry, &nvmet_subsystems_group.cg_children) {
-               struct config_item *item = container_of(entry, struct config_item, ci_entry);
+               struct config_item *item =
+                       container_of(entry, struct config_item, ci_entry); +
                if (!strncmp(config_item_name(item), page, len)) { pr_err("duplicate NQN %s\n",
config_item_name(item));
                        up_write(&nvmet_config_sem);

-ck

#4 lore raw
Quoted 99 lines · Chaitanya Kulkarni
Quoted 54 lines · On 12/11/23 00:10, [email protected] wrote:

From: Hannes Reinecke <[email protected]>

Add a configfs attribute 'discovery_nqn' in the 'nvmet' configfs directory to specify the unique discovery NQN.

---
   drivers/nvme/target/configfs.c | 45 ++++++++++++++++++++++++++++++++++
   drivers/nvme/target/core.c     |  7 ++++++
   2 files changed, 52 insertions(+)
drivers/nvme/target/configfs.c +28 -0
index d937fe05129e..88911d0cd057 100644
@@ -1587,6 +1587,11 @@ static struct config_group *nvmet_subsys_make(struct config_group *group,
   		return ERR_PTR(-EINVAL);
   	}
 
+	if (sysfs_streq(name, nvmet_disc_subsys->subsysnqn)) {
+		pr_err("can't create subsystem using unique discovery NQN\n");
+		return ERR_PTR(-EINVAL);
+	}
+
   	subsys = nvmet_subsys_alloc(name, NVME_NQN_NVME);
   	if (IS_ERR(subsys))
   		return ERR_CAST(subsys);
@@ -2131,7 +2136,47 @@ static const struct config_item_type nvmet_hosts_type = {
 
   static struct config_group nvmet_hosts_group;
 
+static ssize_t nvmet_root_discovery_nqn_show(struct config_item *item,
+					     char *page)
+{
+	return sprintf(page, "%s\n", nvmet_disc_subsys->subsysnqn);
+}
+
+static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,
+		const char *page, size_t count)
+{
+	size_t len;
+	struct list_head *entry;
+
+	len = strcspn(page, "\n");
+	if (!len || len > NVMF_NQN_FIELD_LEN - 1)
+		return -EINVAL;
+
+	down_write(&nvmet_config_sem);
+	list_for_each(entry, &nvmet_subsystems_group.cg_children) {
+		struct config_item *item = container_of(entry, struct config_item, ci_entry);
+		if (!strncmp(config_item_name(item), page, len)) {
+			pr_err("duplicate NQN %s\n", config_item_name(item));
+			up_write(&nvmet_config_sem);
+			return -EINVAL;

drivers/nvme/target/configfs.c static const struct config_item_type nvmet_hosts_type = { · line 2171

Quoted 10 lines
drivers/nvme/target/configfs.c +9 -0
+		}
+	}
+	memset(nvmet_disc_subsys->subsysnqn, 0, NVMF_NQN_FIELD_LEN);
+	memcpy(nvmet_disc_subsys->subsysnqn, page, len);
+	up_write(&nvmet_config_sem);
+
+	return len;
+}
+
 

please consider something like following, it removes long line re-structures the declaration totally untested :-

drivers/nvme/target/configfs.c +1 -1
index 88911d0cd057..05d67ddfe83e 100644
@@ -2145,8 +2145,8 @@ static ssize_t
 nvmet_root_discovery_nqn_show(struct config_item *item,
   static ssize_t nvmet_root_discovery_nqn_store(struct config_item *item,
                  const char *page, size_t count)
   {
-       size_t len;
          struct list_head *entry;
+       size_t len;
 
          len = strcspn(page, "\n");
          if (!len || len > NVMF_NQN_FIELD_LEN - 1)
drivers/nvme/target/configfs.c +3 -1
@@ -2154,7 +2154,9 @@ static ssize_t
 nvmet_root_discovery_nqn_store(struct config_item *item,
 
          down_write(&nvmet_config_sem);
          list_for_each(entry, &nvmet_subsystems_group.cg_children) {
-               struct config_item *item = container_of(entry, struct
 config_item, ci_entry);
+               struct config_item *item =
+                       container_of(entry, struct config_item, ci_entry);
+
                  if (!strncmp(config_item_name(item), page, len)) {

                        pr_err("duplicate NQN %s\n",
config_item_name(item));
                        up_write(&nvmet_config_sem);

Quoted 3 lines

-ck

Ok, will be resending.

Cheers,

Hannes

Signature · 5 lines
Dr. Hannes Reinecke                Kernel Storage Architect
[email protected]                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Ivo Totev, Andrew McDonald,
Werner Knoblich