Commit 4a982919 authored Jul 29, 2019 by Keith Busch Committed by Greg Kroah-Hartman Sep 06, 2019

nvme-pci: Fix async probe remove race



[ Upstream commit bd46a90634302bfe791e93ad5496f98f165f7ae0 ]

Ensure the controller is not in the NEW state when nvme_probe() exits.
This will always allow a subsequent nvme_remove() to set the state to
DELETING, fixing a potential race between the initial asynchronous probe
and device removal.

Reported-by: Li Zhong <lizhongfs@gmail.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 431f579a

drivers/nvme/host/pci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2468,7 +2468,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie)
		{
		struct nvme_dev *dev = data;

		nvme_reset_ctrl_sync(&dev->ctrl);
		flush_work(&dev->ctrl.reset_work);
		flush_work(&dev->ctrl.scan_work);
		nvme_put_ctrl(&dev->ctrl);
		}
		@@ -2535,6 +2535,7 @@ static int nvme_probe(struct pci_dev pdev, const struct pci_device_id id)

		dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));

		nvme_reset_ctrl(&dev->ctrl);
		nvme_get_ctrl(&dev->ctrl);
		async_schedule(nvme_async_probe, dev);