From: Sagi Grimberg <sagi@grimberg.me>
To: Christoph Hellwig <hch@infradead.org>, Mike Snitzer <snitzer@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>,
linux-nvme@lists.infradead.org, dm-devel@redhat.com,
Ewan Milne <emilne@redhat.com>, Chao Leng <lengchao@huawei.com>,
Keith Busch <kbusch@kernel.org>,
"Meneghini, John" <John.Meneghini@netapp.com>
Subject: Re: [RESEND PATCH] nvme: explicitly use normal NVMe error handling when appropriate
Date: Thu, 13 Aug 2020 23:53:14 -0700 [thread overview]
Message-ID: <96aff2d0-5907-f5c9-9164-8fea0d030d95@grimberg.me> (raw)
In-Reply-To: <20200813184349.GA8191@infradead.org>
> +static inline enum nvme_disposition nvme_req_disposition(struct request *req)
> +{
> + if (likely(nvme_req(req)->status == 0))
> + return COMPLETE;
> +
> + if (blk_noretry_request(req) ||
> + (nvme_req(req)->status & NVME_SC_DNR) ||
> + nvme_req(req)->retries >= nvme_max_retries)
> + return COMPLETE;
> +
> + if (req->cmd_flags & REQ_NVME_MPATH) {
> + switch (nvme_req(req)->status & 0x7ff) {
> + case NVME_SC_ANA_TRANSITION:
> + case NVME_SC_ANA_INACCESSIBLE:
> + case NVME_SC_ANA_PERSISTENT_LOSS:
> + return REDIRECT_ANA;
> + case NVME_SC_HOST_PATH_ERROR:
> + case NVME_SC_HOST_ABORTED_CMD:
> + return REDIRECT_TMP;
> + }
> + }
> +
> + if (blk_queue_dying(req->q))
> + return COMPLETE;
> + return RETRY;
> +}
> +
> +static inline void nvme_complete_req(struct request *req)
> {
> blk_status_t status = nvme_error_status(nvme_req(req)->status);
>
> - trace_nvme_complete_rq(req);
> + if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
> + req_op(req) == REQ_OP_ZONE_APPEND)
> + req->__sector = nvme_lba_to_sect(req->q->queuedata,
> + le64_to_cpu(nvme_req(req)->result.u64));
> +
> + nvme_trace_bio_complete(req, status);
> + blk_mq_end_request(req, status);
> +}
>
> +void nvme_complete_rq(struct request *req)
> +{
> + trace_nvme_complete_rq(req);
> nvme_cleanup_cmd(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) && nvme_failover_req(req))
> - return;
> -
> - if (!blk_queue_dying(req->q)) {
> - nvme_retry_req(req);
> - return;
> - }
> - } else if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
> - req_op(req) == REQ_OP_ZONE_APPEND) {
> - req->__sector = nvme_lba_to_sect(req->q->queuedata,
> - le64_to_cpu(nvme_req(req)->result.u64));
> + switch (nvme_req_disposition(req)) {
> + case COMPLETE:
> + nvme_complete_req(req);
nvme_complete_rq calling nvme_complete_req... Maybe call it
__nvme_complete_rq instead?
> + return;
> + case RETRY:
> + nvme_retry_req(req);
> + return;
> + case REDIRECT_ANA:
> + nvme_failover_req(req, true);
> + return;
> + case REDIRECT_TMP:
> + nvme_failover_req(req, false);
> + return;
> }
> -
> - nvme_trace_bio_complete(req, status);
> - blk_mq_end_request(req, status);
> }
> EXPORT_SYMBOL_GPL(nvme_complete_rq);
>
> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
> index 3ded54d2c9c6ad..0c22b2c88687a2 100644
> --- a/drivers/nvme/host/multipath.c
> +++ b/drivers/nvme/host/multipath.c
> @@ -65,51 +65,32 @@ void nvme_set_disk_name(char *disk_name, struct nvme_ns *ns,
> }
> }
>
> -bool nvme_failover_req(struct request *req)
> +void nvme_failover_req(struct request *req, bool is_ana_status)
> {
> struct nvme_ns *ns = req->q->queuedata;
> - u16 status = nvme_req(req)->status;
> unsigned long flags;
>
> - switch (status & 0x7ff) {
> - case NVME_SC_ANA_TRANSITION:
> - case NVME_SC_ANA_INACCESSIBLE:
> - case NVME_SC_ANA_PERSISTENT_LOSS:
> - /*
> - * If we got back an ANA error we know the controller is alive,
> - * but not ready to serve this namespaces. The spec suggests
> - * we should update our general state here, but due to the fact
> - * that the admin and I/O queues are not serialized that is
> - * fundamentally racy. So instead just clear the current path,
> - * mark the the path as pending and kick of a re-read of the ANA
> - * log page ASAP.
> - */
> - nvme_mpath_clear_current_path(ns);
> - if (ns->ctrl->ana_log_buf) {
> - set_bit(NVME_NS_ANA_PENDING, &ns->flags);
> - queue_work(nvme_wq, &ns->ctrl->ana_work);
> - }
> - break;
> - case NVME_SC_HOST_PATH_ERROR:
> - case NVME_SC_HOST_ABORTED_CMD:
> - /*
> - * Temporary transport disruption in talking to the controller.
> - * Try to send on a new path.
> - */
> - nvme_mpath_clear_current_path(ns);
> - break;
> - default:
> - /* This was a non-ANA error so follow the normal error path. */
> - return false;
> + nvme_mpath_clear_current_path(ns);
> +
> + /*
> + * If we got back an ANA error we know the controller is alive, but not
> + * ready to serve this namespaces. The spec suggests we should update
> + * our general state here, but due to the fact that the admin and I/O
> + * queues are not serialized that is fundamentally racy. So instead
> + * just clear the current path, mark the the path as pending and kick
> + * of a re-read of the ANA log page ASAP.
> + */
> + if (is_ana_status && ns->ctrl->ana_log_buf) {
Maybe call nvme_req_disposition again locally here to not carry
the is_ana_status. But not a biggy..
Overall this looks good I think.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-08-14 6:53 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 5:58 [PATCH] nvme-core: fix io interrupt when work with dm-multipah Chao Leng
2020-07-28 11:19 ` Christoph Hellwig
2020-07-29 2:54 ` Chao Leng
2020-07-29 5:59 ` Christoph Hellwig
2020-07-30 1:49 ` Chao Leng
2020-08-05 6:40 ` Chao Leng
2020-08-05 15:29 ` Keith Busch
2020-08-06 5:52 ` Chao Leng
2020-08-06 14:26 ` Keith Busch
2020-08-06 15:59 ` Meneghini, John
2020-08-06 16:17 ` Meneghini, John
2020-08-06 18:40 ` Mike Snitzer
2020-08-06 19:19 ` [PATCH] nvme: restore use of blk_path_error() in nvme_complete_rq() Mike Snitzer
2020-08-06 22:42 ` Meneghini, John
2020-08-07 0:07 ` Mike Snitzer
2020-08-07 1:21 ` Sagi Grimberg
2020-08-07 4:50 ` Mike Snitzer
2020-08-07 23:35 ` Sagi Grimberg
2020-08-08 21:08 ` Meneghini, John
2020-08-08 21:11 ` Meneghini, John
2020-08-10 14:48 ` Mike Snitzer
2020-08-11 12:54 ` Meneghini, John
2020-08-10 8:10 ` Chao Leng
2020-08-11 12:36 ` Meneghini, John
2020-08-12 7:51 ` Chao Leng
2020-08-10 14:36 ` Mike Snitzer
2020-08-10 17:22 ` [PATCH] nvme: explicitly use normal NVMe error handling when appropriate Mike Snitzer
2020-08-11 3:32 ` Chao Leng
2020-08-11 4:20 ` Mike Snitzer
2020-08-11 6:17 ` Chao Leng
2020-08-11 14:12 ` Mike Snitzer
2020-08-13 14:48 ` [RESEND PATCH] " Mike Snitzer
2020-08-13 15:29 ` Meneghini, John
2020-08-13 15:43 ` Mike Snitzer
2020-08-13 15:59 ` Meneghini, John
2020-08-13 15:36 ` Christoph Hellwig
2020-08-13 17:47 ` Mike Snitzer
2020-08-13 18:43 ` Christoph Hellwig
2020-08-13 19:03 ` Mike Snitzer
2020-08-14 4:26 ` Meneghini, John
2020-08-14 6:53 ` Sagi Grimberg [this message]
2020-08-14 6:55 ` Christoph Hellwig
2020-08-14 7:02 ` Sagi Grimberg
2020-08-14 3:23 ` Meneghini, John
2020-08-07 0:44 ` [PATCH] nvme: restore use of blk_path_error() in nvme_complete_rq() Sagi Grimberg
2020-08-10 12:43 ` Christoph Hellwig
2020-08-10 15:06 ` Mike Snitzer
2020-08-11 3:45 ` [PATCH] " Chao Leng
2020-08-07 0:03 ` [PATCH] nvme-core: fix io interrupt when work with dm-multipah Sagi Grimberg
2020-08-07 2:28 ` Chao Leng
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=96aff2d0-5907-f5c9-9164-8fea0d030d95@grimberg.me \
--to=sagi@grimberg.me \
--cc=John.Meneghini@netapp.com \
--cc=dm-devel@redhat.com \
--cc=emilne@redhat.com \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=kbusch@kernel.org \
--cc=lengchao@huawei.com \
--cc=linux-nvme@lists.infradead.org \
--cc=snitzer@redhat.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).