Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53029b04 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

NVMe: Remove device management handles on remove 



We don't want to allow new references to open on a device that is
removed. This ties the lifetime of these handles to the physical device's
presence rather than to the open reference count.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 92f7a162

drivers/nvme/host/core.c

+9 −4
Original line number Diff line number Diff line
@@ -1200,17 +1200,22 @@ static void nvme_release_instance(struct nvme_ctrl *ctrl) 
	spin_unlock(&dev_list_lock);

}



static void nvme_free_ctrl(struct kref *kref)

void nvme_uninit_ctrl(struct nvme_ctrl *ctrl)

 {

	struct nvme_ctrl *ctrl = container_of(kref, struct nvme_ctrl, kref);

	device_remove_file(ctrl->device, &dev_attr_reset_controller);

	device_destroy(nvme_class, MKDEV(nvme_char_major, ctrl->instance));



	spin_lock(&dev_list_lock);

	list_del(&ctrl->node);

	spin_unlock(&dev_list_lock);

}



static void nvme_free_ctrl(struct kref *kref)

{

	struct nvme_ctrl *ctrl = container_of(kref, struct nvme_ctrl, kref);



	put_device(ctrl->device);

	nvme_release_instance(ctrl);

	device_destroy(nvme_class, MKDEV(nvme_char_major, ctrl->instance));



	ctrl->ops->free_ctrl(ctrl);

}

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap); 
int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl);

int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,

		const struct nvme_ctrl_ops *ops, unsigned long quirks);

void nvme_uninit_ctrl(struct nvme_ctrl *ctrl);

void nvme_put_ctrl(struct nvme_ctrl *ctrl);

int nvme_init_identify(struct nvme_ctrl *ctrl);

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,7 @@ static void nvme_remove(struct pci_dev *pdev) 
	flush_work(&dev->reset_work);

	flush_work(&dev->scan_work);

	nvme_remove_namespaces(&dev->ctrl);

	nvme_uninit_ctrl(&dev->ctrl);

	nvme_dev_shutdown(dev);

	nvme_dev_remove_admin(dev);

	nvme_free_queues(dev, 0);