diff options
| author | Keith Busch | 2019-04-30 17:33:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-15 11:54:06 +0200 |
| commit | 52d7b067fadf8b66eabd6101338a871e14e872df (patch) | |
| tree | d68b8525d26d1c00186ad0fcd352185dad878d15 /drivers/nvme | |
| parent | nvme-pci: unquiesce admin queue on shutdown (diff) | |
| download | kernel-qcow2-linux-52d7b067fadf8b66eabd6101338a871e14e872df.tar.gz kernel-qcow2-linux-52d7b067fadf8b66eabd6101338a871e14e872df.tar.xz kernel-qcow2-linux-52d7b067fadf8b66eabd6101338a871e14e872df.zip | |
nvme-pci: shutdown on timeout during deletion
[ Upstream commit 9dc1a38ef1925d23c2933c5867df816386d92ff8 ]
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@huawei.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 377f6fff420d..c8eeecc58115 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1132,6 +1132,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 @@ -1168,12 +1169,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: |