Commit 733e4b69 authored by Keith Busch's avatar Keith Busch Committed by Sagi Grimberg
Browse files

nvme: Assign subsys instance from first ctrl 



The namespace disk names must be unique for the lifetime of the
subsystem. This was accomplished by using their parent subsystems'
instances which were allocated independently from the controllers
connected to that subsystem. This allowed name prefixes assigned to
namespaces to match a controller from an unrelated subsystem, and has
created confusion among users examining device nodes.

Ensure a namespace's subsystem instance never clashes with a controller
instance of another subsystem by transferring the instance ownership
to the parent subsystem from the first controller discovered in that
subsystem.

Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMinwoo Im <minwoo.im@samsung.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent 312910f4

drivers/nvme/host/core.c

+10 −11
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ EXPORT_SYMBOL_GPL(nvme_reset_wq); 
struct workqueue_struct *nvme_delete_wq;

EXPORT_SYMBOL_GPL(nvme_delete_wq);



static DEFINE_IDA(nvme_subsystems_ida);

static LIST_HEAD(nvme_subsystems);

static DEFINE_MUTEX(nvme_subsystems_lock);
@@ -2345,7 +2344,8 @@ static void nvme_release_subsystem(struct device *dev) 
	struct nvme_subsystem *subsys =

		container_of(dev, struct nvme_subsystem, dev);



	ida_simple_remove(&nvme_subsystems_ida, subsys->instance);

	if (subsys->instance >= 0)

		ida_simple_remove(&nvme_instance_ida, subsys->instance);

	kfree(subsys);

}
@@ -2485,12 +2485,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
	subsys = kzalloc(sizeof(*subsys), GFP_KERNEL);

	if (!subsys)

		return -ENOMEM;

	ret = ida_simple_get(&nvme_subsystems_ida, 0, 0, GFP_KERNEL);

	if (ret < 0) {

		kfree(subsys);

		return ret;

	}

	subsys->instance = ret;



	subsys->instance = -1;

	mutex_init(&subsys->lock);

	kref_init(&subsys->ref);

	INIT_LIST_HEAD(&subsys->ctrls);
@@ -2509,7 +2505,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
	subsys->dev.class = nvme_subsys_class;

	subsys->dev.release = nvme_release_subsystem;

	subsys->dev.groups = nvme_subsys_attrs_groups;

	dev_set_name(&subsys->dev, "nvme-subsys%d", subsys->instance);

	dev_set_name(&subsys->dev, "nvme-subsys%d", ctrl->instance);

	device_initialize(&subsys->dev);



	mutex_lock(&nvme_subsystems_lock);
@@ -2540,6 +2536,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
		goto out_put_subsystem;

	}



	if (!found)

		subsys->instance = ctrl->instance;

	ctrl->subsys = subsys;

	list_add_tail(&ctrl->subsys_entry, &subsys->ctrls);

	mutex_unlock(&nvme_subsystems_lock);
@@ -3810,7 +3808,9 @@ static void nvme_free_ctrl(struct device *dev) 
		container_of(dev, struct nvme_ctrl, ctrl_device);

	struct nvme_subsystem *subsys = ctrl->subsys;



	if (subsys && ctrl->instance != subsys->instance)

		ida_simple_remove(&nvme_instance_ida, ctrl->instance);



	kfree(ctrl->effects);

	nvme_mpath_uninit(ctrl);

	__free_page(ctrl->discard_page);
@@ -4095,7 +4095,6 @@ out: 


static void __exit nvme_core_exit(void)

{

	ida_destroy(&nvme_subsystems_ida);

	class_destroy(nvme_subsys_class);

	class_destroy(nvme_class);

	unregister_chrdev_region(nvme_chr_devt, NVME_MINORS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE