Re: [PATCH] nvme: remove disk after hw queue is started
From: Keith Busch <hidden>
Date: 2017-05-08 15:11:24
Also in:
linux-nvme, stable
Subsystem:
nvm express driver, the rest · Maintainers:
Keith Busch, Jens Axboe, Christoph Hellwig, Sagi Grimberg, Linus Torvalds
On Mon, May 08, 2017 at 11:07:20AM -0400, Keith Busch wrote:
I'm almost certain the remove_work shouldn't even be running in this case. If the reset work can't transition the controller state correctly, it should assume something is handling the controller.
Here's the more complete version of what I had in mind. Does this solve the reported issue? ---
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 26a5fd0..46a37fb 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c@@ -1792,7 +1792,7 @@ static void nvme_reset_work(struct work_struct *work) nvme_dev_disable(dev, false); if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RESETTING)) - goto out; + return; result = nvme_pci_enable(dev); if (result)
@@ -1854,7 +1854,7 @@ static void nvme_reset_work(struct work_struct *work) if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE)) { dev_warn(dev->ctrl.device, "failed to mark controller live\n"); - goto out; + return; } if (dev->online_queues > 1) --