Commit ff23a2a1 authored Feb 11, 2016 by Keith Busch Committed by Jens Axboe Feb 12, 2016

NVMe: Poll device while still active during remove



A device failure or link down wouldn't have been detected during namespace
removal. This patch keeps the device in the list for polling so that the
thread may see such failure and initiate a reset. The device is removed
from the list after disable, so we can safely flush the reset work as
it can't be requeued when disable completes.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent ae1fba20

drivers/nvme/host/pci.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -2116,16 +2116,12 @@ static void nvme_remove(struct pci_dev *pdev)
		{
		struct nvme_dev *dev = pci_get_drvdata(pdev);

		spin_lock(&dev_list_lock);
		list_del_init(&dev->node);
		spin_unlock(&dev_list_lock);

		pci_set_drvdata(pdev, NULL);
		flush_work(&dev->reset_work);
		flush_work(&dev->scan_work);
		nvme_remove_namespaces(&dev->ctrl);
		nvme_uninit_ctrl(&dev->ctrl);
		nvme_dev_disable(dev, true);
		flush_work(&dev->reset_work);
		nvme_dev_remove_admin(dev);
		nvme_free_queues(dev, 0);
		nvme_release_cmb(dev);

Admin message