nvme/pci: Shutdown on timeout during deletion
PATCH 1/2 nvme/pci: Shutdown on timeout during deletion
We do not restart a controller in a deleting state for timeout errors. When in this state, unblock potential request dispatchers with failed completions by shutting down the controller on timeout detection.
Reported-by Yufen Yu <yuyufen at huawei.com>
Signed-off-by Keith Busch <keith.busch at intel.com>
--- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +4 -1
@@ -1276,6 +1276,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)struct nvme_dev *dev = nvmeq->dev;struct request *abort_req;struct nvme_command cmd; +bool shutdown = false;u32 csts =readl (dev->bar +NVME_REG_CSTS );/* If PCI error recovery process is happening, we cannot reset or
@@ -1312,12 +1313,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)* shutdown, so we return BLK_EH_DONE. */ switch (dev->ctrl.state) { +case NVME_CTRL_DELETING : + shutdown = true;case NVME_CTRL_CONNECTING :case NVME_CTRL_RESETTING :dev_warn_ratelimited (dev->ctrl.device,"I/O %d QID %d timeout, disable controller\n" , req->tag, nvmeq->qid); -nvme_dev_disable (dev, false); +nvme_dev_disable (dev, shutdown);nvme_req (req)->flags |=NVME_REQ_CANCELLED ;return BLK_EH_DONE ;default :
Signature · 1 line
2.14.4
PATCH 2/2 nvme/pci: Unquiesce admin queue on shutdown
Just like IO queues, the admin queue also will not be restarted after a controller shutdown. Unquiesce this queue so that we do not block request dispatch on a permanently disabled controller.
Reported-by Yufen Yu <yuyufen at huawei.com>
Signed-off-by Keith Busch <keith.busch at intel.com>
--- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +4 -1
@@ -2436,8 +2436,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)* must flush all entered requests to their failed completion to avoid * deadlocking blk-mq hot-cpu notifier. */ -if (shutdown) +if (shutdown) {nvme_start_queues (&dev->ctrl); +if (dev->ctrl.admin_q && !blk_queue_dying (dev->ctrl.admin_q)) +blk_mq_unquiesce_queue (dev->ctrl.admin_q); + }mutex_unlock (&dev->shutdown_lock); }
Signature · 1 line
2.14.4
PATCH 1/2 nvme/pci: Shutdown on timeout during deletion
In reply to Keith BuschThanks,
applied both patches to nvme-5.2.