From: Keith Busch <keith.busch@intel.com>
Date: Mon, 4 Jan 2016 16:10:56 +0000 (-0700)
Subject: NVMe: Use a retryable error code on reset
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~10866^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1d49c38c4865c596b01b31a52540275c1bb383e7;p=mirror_ubuntu-focal-kernel.git

NVMe: Use a retryable error code on reset

A negative status has the "do not retry" bit set, which makes it not
retryable.  Use a fake status that can potentially be retried on reset.

An aborted command's status is overridden by the timeout handler so
that it won't be retried, which is necessary to keep initialization from
getting into a reset loop.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 30ed2ab2cadb..ac6c7afb2a6e 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1017,7 +1017,7 @@ static void nvme_cancel_queue_ios(struct request *req, void *data, bool reserved
 	dev_warn(nvmeq->q_dmadev,
 		 "Cancelling I/O %d QID %d\n", req->tag, nvmeq->qid);
 
-	status = NVME_SC_CANCELLED;
+	status = NVME_SC_ABORT_REQ;
 	if (blk_queue_dying(req->q))
 		status |= NVME_SC_DNR;
 	blk_mq_complete_request(req, status);