nvme: sync timeout work on failed reset

Timeouts during reset will set the controller for failure, preventing
the state change to LIVE. Ensure all timeout work is synced after the
controller disabling completes to ensure we don't have any other tasks
messing with any namespace request_queue's.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 8eaa954aa6ed4fb376e9f773b0beebab9edf2fad..bfeadecf9e15b313775454ef94be969e0109e4b1 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2777,6 +2777,7 @@ static void nvme_reset_work(struct work_struct *work)
                 result);
        nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DELETING);
        nvme_dev_disable(dev, true);
+       nvme_sync_queues(&dev->ctrl);
        nvme_mark_namespaces_dead(&dev->ctrl);
        nvme_unquiesce_io_queues(&dev->ctrl);
        nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD);