Commit 39a9dd81 authored by Keith Busch's avatar Keith Busch
Browse files

nvme-pci: Don't disable on timeout in reset state 



The reset state doesn't dispatch commands that it needs to wait for
anymore. If a timeout occurs in this state, the reset work is already
disabling the controller, so just reset the request's timer.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent e43269e6

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1298,13 +1298,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
		shutdown = true;

		/* fall through */

	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, shutdown);

		nvme_req(req)->flags |= NVME_REQ_CANCELLED;

		return BLK_EH_DONE;

	case NVME_CTRL_RESETTING:

		return BLK_EH_RESET_TIMER;

	default:

		break;

	}