From: Keith Busch <kbusch@kernel.org>

Date: Thu, 5 Sep 2019 08:09:33 -0600

Subject: [PATCH] nvme: Restart request timers in resetting state

Git-commit: 92b98e88d59ab17e65f261fbb5db272143ccf414

Patch-mainline: v5.4-rc4

References: bsc#1169045

A controller in the resetting state has not yet completed its recovery

actions. The pci and fc transports were already handling this, so update

the remaining transports to not attempt additional recovery in this

state. Instead, just restart the request timer.

Tested-by: Edmund Nadolski <edmund.nadolski@intel.com>

Reviewed-by: James Smart <james.smart@broadcom.com>

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Keith Busch <kbusch@kernel.org>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/host/rdma.c | 8 ++++++++

 drivers/nvme/host/tcp.c  | 8 ++++++++

 2 files changed, 16 insertions(+)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c

index 4d280160dd3f..f19a28b4e997 100644

--- a/drivers/nvme/host/rdma.c

+++ b/drivers/nvme/host/rdma.c

@@ -1701,6 +1701,14 @@ nvme_rdma_timeout(struct request *rq, bool reserved)

 	dev_warn(ctrl->ctrl.device, "I/O %d QID %d timeout\n",

 		 rq->tag, nvme_rdma_queue_idx(queue));

+	/*

+	 * Restart the timer if a controller reset is already scheduled. Any

+	 * timed out commands would be handled before entering the connecting

+	 * state.

+	 */

+	if (ctrl->ctrl.state == NVME_CTRL_RESETTING)

+		return BLK_EH_RESET_TIMER;

+

 	if (ctrl->ctrl.state != NVME_CTRL_LIVE) {

 		/*

 		 * Teardown immediately if controller times out while starting

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c

index 385a5212c10f..33de2fddfbb2 100644

--- a/drivers/nvme/host/tcp.c

+++ b/drivers/nvme/host/tcp.c

@@ -2044,6 +2044,14 @@ nvme_tcp_timeout(struct request *rq, bool reserved)

 	struct nvme_tcp_ctrl *ctrl = req->queue->ctrl;

 	struct nvme_tcp_cmd_pdu *pdu = req->pdu;

+	/*

+	 * Restart the timer if a controller reset is already scheduled. Any

+	 * timed out commands would be handled before entering the connecting

+	 * state.

+	 */

+	if (ctrl->ctrl.state == NVME_CTRL_RESETTING)

+		return BLK_EH_RESET_TIMER;

+

 	dev_warn(ctrl->ctrl.device,

 		"queue %d: timeout request %#x type %d\n",

 		nvme_tcp_queue_id(req->queue), rq->tag, pdu->hdr.type);

-- 

2.16.4