diff options
| author | Keith Busch <kbusch@kernel.org> | 2019-07-29 16:34:52 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:23:16 +0200 |
| commit | c88a50ced6de8188725681ed70abe7f0b0133c94 (patch) | |
| tree | e9247a0bbb777bdf573fa2733686df272c7d41a8 | |
| parent | 9dd8dc3d8a798188a2274de8fe24876ab15e28c8 (diff) | |
| download | linux-stable-c88a50ced6de8188725681ed70abe7f0b0133c94.tar.gz linux-stable-c88a50ced6de8188725681ed70abe7f0b0133c94.tar.bz2 linux-stable-c88a50ced6de8188725681ed70abe7f0b0133c94.zip | |
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>
| -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 f9959eaaa185..09ffd21d1809 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2712,7 +2712,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); } @@ -2778,6 +2778,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); |