From: edmund.nadolski@intel.com (Nadolski, Edmund)
Subject: [PATCHv3] nvme: Return BLK_STS_TARGET if the DNR bit is set
Date: Mon, 12 Aug 2019 17:37:25 -0600 [thread overview]
Message-ID: <a8b400cf-94ef-a4a1-e196-a74e115357ea@intel.com> (raw)
In-Reply-To: <20190812075147.79598-1-hare@suse.de>
On 8/12/2019 1:51 AM, Hannes Reinecke wrote:
> If the DNR bit is set we should not retry the command, even if
> the standard status evaluation indicates so.
>
> Signed-off-by: Hannes Reinecke <hare at suse.com>
> ---
> drivers/nvme/host/core.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index cc09b81fc7f4..5e1309709917 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -267,15 +267,20 @@ void nvme_complete_rq(struct request *req)
> if (nvme_req(req)->ctrl->kas)
> nvme_req(req)->ctrl->comp_seen = true;
>
> - if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) {
> - if ((req->cmd_flags & REQ_NVME_MPATH) &&
> - blk_path_error(status)) {
> - nvme_failover_req(req);
> - return;
> + if (unlikely(status != BLK_STS_OK)) {
> + if (nvme_req_needs_retry(req)) {
> + if ((req->cmd_flags & REQ_NVME_MPATH) &&
> + blk_path_error(status)) {
> + nvme_failover_req(req);
> + return;
> + }
> + if (!blk_queue_dying(req->q)) {
> + nvme_retry_req(req);
> + return;
> + }
> }
> -
> - if (!blk_queue_dying(req->q)) {
> - nvme_retry_req(req);
> + if (nvme_req(req)->status & NVME_SC_DNR) {
> + blk_mq_end_request(req, BLK_STS_TARGET);
> return;
> }
> }
This seems redundant, to re-check the NVME_SC_DNR here, after just
checking it in nvme_req_needs_retry().
Ed
next prev parent reply other threads:[~2019-08-12 23:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 7:51 [PATCHv3] nvme: Return BLK_STS_TARGET if the DNR bit is set Hannes Reinecke
2019-08-12 23:37 ` Nadolski, Edmund [this message]
2019-08-13 6:32 ` Sagi Grimberg
2019-08-13 14:15 ` Keith Busch
2019-08-13 16:37 ` Sagi Grimberg
2019-08-13 16:56 ` Hannes Reinecke
2019-08-13 17:01 ` Christoph Hellwig
2019-08-13 17:03 ` Hannes Reinecke
2019-08-13 17:08 ` 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=a8b400cf-94ef-a4a1-e196-a74e115357ea@intel.com \
--to=edmund.nadolski@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;
as well as URLs for NNTP newsgroup(s).