From: keith.busch@intel.com (Keith Busch)
Subject: [PATCHv3 2/5] NVMe: Use a retryable error code on reset
Date: Mon, 4 Jan 2016 09:10:56 -0700 [thread overview]
Message-ID: <1451923859-14187-3-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1451923859-14187-1-git-send-email-keith.busch@intel.com>
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 at intel.com>
---
drivers/nvme/host/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 30ed2ab..ac6c7af 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);
--
2.6.2.307.g37023ba
next prev parent reply other threads:[~2016-01-04 16:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-04 16:10 [PATCHv3 0/5] NVMe fixes and updates, v3 Keith Busch
2016-01-04 16:10 ` [PATCHv3 1/5] NVMe: Fix admin queue ring wrap Keith Busch
2016-01-04 16:10 ` Keith Busch [this message]
2016-01-04 16:10 ` [PATCHv3 3/5] NVMe: Remove queue freezing on resets Keith Busch
2016-01-04 16:10 ` [PATCHv3 4/5] NVMe: IO queue deletion re-write Keith Busch
2016-01-06 13:04 ` Christoph Hellwig
2016-01-06 15:44 ` Keith Busch
2016-01-12 20:33 ` Jens Axboe
2016-01-06 19:51 ` Keith Busch
2016-01-07 18:54 ` Christoph Hellwig
2016-01-04 16:10 ` [PATCHv3 5/5] NVMe: Shutdown controller only for power-off Keith Busch
2016-01-04 16:36 ` [PATCHv3 0/5] NVMe fixes and updates, v3 Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451923859-14187-3-git-send-email-keith.busch@intel.com \
--to=keith.busch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox