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

Commit 4244140d authored by Keith Busch's avatar Keith Busch
Browse files

nvme-pci: Fix timeouts in connecting state 



We need to halt the controller immediately if we haven't completed
initialization as indicated by the new "connecting" state.

Fixes: ad70062c ("nvme-pci: introduce RECONNECTING state to mark initializing procedure")
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 815c6704

drivers/nvme/host/pci.c

+5 −1
Original line number Diff line number Diff line
@@ -1215,13 +1215,17 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	 * cancellation error. All outstanding requests are completed on

	 * shutdown, so we return BLK_EH_HANDLED.

	 */

	if (dev->ctrl.state == NVME_CTRL_RESETTING) {

	switch (dev->ctrl.state) {

	case NVME_CTRL_CONNECTING:

	case NVME_CTRL_RESETTING:

		dev_warn(dev->ctrl.device,

			 "I/O %d QID %d timeout, disable controller\n",

			 req->tag, nvmeq->qid);

		nvme_dev_disable(dev, false);

		nvme_req(req)->flags |= NVME_REQ_CANCELLED;

		return BLK_EH_HANDLED;

	default:

		break;

	}



	/*