Skip to contentSkip to conversation

nvme: Skip checking heads without namespaces

PATCH New Keith Busch 3 participants 4 messages Mar 19, 2018 – Mar 20, 2018

Subsystems (2)
Stable branch NVMe
lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 nvme: Skip checking heads without namespaces

If a task is holding a reference to a namespace on a removed controller, the head will not be released. If the same controller is added again later, its namespaces may not be successfully added. Instead, the user will see kernel message "Duplicate IDs for nsid <X>".

This patch fixes that by skipping heads that don't have namespaces when considering if a new namespace is safe to add.

Reported-by Alex Gagniuc <[email protected]>
Cc [email protected]
Signed-off-by Keith Busch <[email protected]>
---
 drivers/nvme/host/core.c | 1 +
 1 file changed, 1 insertion(+)
drivers/nvme/host/core.c +1 -0
index 7aeca5db7916..0b9e60861e53 100644
@@ -2793,6 +2793,7 @@ static int __nvme_check_ids(struct nvme_subsystem *subsys,
 
 	list_for_each_entry(h, &subsys->nsheads, entry) {
 		if (nvme_ns_ids_valid(&new->ids) &&
+		    !list_empty(&h->list) &&
 		    nvme_ns_ids_equal(&new->ids, &h->ids))
 			return -EINVAL;
 	}
Signature · 1 line
2.14.3
maintainer
#1 lore raw

PATCH 1/1 nvme: Skip checking heads without namespaces

Quoted 7 lines · Keith Busch

If a task is holding a reference to a namespace on a removed controller, the head will not be released. If the same controller is added again later, its namespaces may not be successfully added. Instead, the user will see kernel message "Duplicate IDs for nsid <X>".

This patch fixes that by skipping heads that don't have namespaces when considering if a new namespace is safe to add.

Delayed reference strike once again, sigh.

Looks fine:

Reviewed-by Christoph Hellwig <hch at lst.de>
#2 lore raw

PATCH 1/1 nvme: Skip checking heads without namespaces

In reply to Keith Busch
Quoted 21 lines · Keith Busch

If a task is holding a reference to a namespace on a removed controller, the head will not be released. If the same controller is added again later, its namespaces may not be successfully added. Instead, the user will see kernel message "Duplicate IDs for nsid <X>".

This patch fixes that by skipping heads that don't have namespaces when considering if a new namespace is safe to add.

Reported-by Alex Gagniuc <Alex_Gagniuc at Dellteam.com>
Cc stable at vger.kernel.org
Signed-off-by Keith Busch <keith.busch at intel.com>
---
  drivers/nvme/host/core.c | 1 +
  1 file changed, 1 insertion(+)
drivers/nvme/host/core.c +0 -0
index 7aeca5db7916..0b9e60861e53 100644

drivers/nvme/host/core.c static int __nvme_check_ids(struct nvme_subsystem *subsys, · line 2799

Quoted 7 lines
drivers/nvme/host/core.c +1 -0
@@ -2793,6 +2793,7 @@ static int __nvme_check_ids(struct nvme_subsystem *subsys,
 
  	list_for_each_entry(h, &subsys->nsheads, entry) {
  		if (nvme_ns_ids_valid(&new->ids) &&
+		    !list_empty(&h->list) &&
  		    nvme_ns_ids_equal(&new->ids, &h->ids))
  			return -EINVAL;
  	}

Looks good,

Reviewed-by Max Gurtovoy <maxg at mellanox.com>
author
#3 lore raw

PATCH 1/1 nvme: Skip checking heads without namespaces

Thannks for the reviews. Applied for 4.17.