Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dc1a38e authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

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: default avatarYufen Yu <yuyufen@huawei.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 049bf372

drivers/nvme/host/pci.c

+4 −1
Original line number Diff line number Diff line
@@ -1277,6 +1277,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
@@ -1313,12 +1314,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: