diff options
| author | Keith Busch | 2019-07-30 00:34:52 +0200 |
|---|---|---|
| committer | Sagi Grimberg | 2019-08-01 03:03:36 +0200 |
| commit | bd46a90634302bfe791e93ad5496f98f165f7ae0 (patch) | |
| tree | 1fe2f3a92c2bdc4a37ed5f20113f91355dcfff61 /drivers/nvme | |
| parent | nvme: fix controller removal race with scan work (diff) | |
| download | kernel-qcow2-linux-bd46a90634302bfe791e93ad5496f98f165f7ae0.tar.gz kernel-qcow2-linux-bd46a90634302bfe791e93ad5496f98f165f7ae0.tar.xz kernel-qcow2-linux-bd46a90634302bfe791e93ad5496f98f165f7ae0.zip | |
nvme-pci: Fix async probe remove race
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index db160cee42ad..0c2c4b0c6655 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2695,7 +2695,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); } @@ -2761,6 +2761,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); |