From: Chao Leng <lengchao@huawei.com>
To: <linux-nvme@lists.infradead.org>
Cc: axboe@kernel.dk, linux-block@vger.kernel.org, sagi@grimberg.me,
axboe@fb.com, lengchao@huawei.com, kbusch@kernel.org, hch@lst.de
Subject: [PATCH 2/6] nvme-core: introduce complete failed request
Date: Tue, 5 Jan 2021 15:19:32 +0800 [thread overview]
Message-ID: <20210105071936.25097-3-lengchao@huawei.com> (raw)
In-Reply-To: <20210105071936.25097-1-lengchao@huawei.com>
When a request is queued failed, if the fail status is not
BLK_STS_RESOURCE, BLK_STS_DEV_RESOURCE, BLK_STS_ZONE_RESOURCE,
the request is need to complete with nvme_complete_rq in queue_rq.
So introduce nvme_try_complete_failed_req.
The request is needed to complete with NVME_SC_HOST_PATH_ERROR in
nvmf_fail_nonready_command and queue_rq.
So introduce nvme_complete_failed_req.
For details, see the subsequent patches.
Signed-off-by: Chao Leng <lengchao@huawei.com>
---
drivers/nvme/host/nvme.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index bfcedfa4b057..1a0bddb9158f 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -649,6 +649,24 @@ void nvme_put_ns_from_disk(struct nvme_ns_head *head, int idx);
extern const struct attribute_group *nvme_ns_id_attr_groups[];
extern const struct block_device_operations nvme_ns_head_ops;
+static inline void nvme_complete_failed_req(struct request *req)
+{
+ nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
+ blk_mq_set_request_complete(req);
+ nvme_complete_rq(req);
+}
+
+static inline blk_status_t nvme_try_complete_failed_req(struct request *req,
+ blk_status_t ret)
+{
+ if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE ||
+ ret == BLK_STS_ZONE_RESOURCE)
+ return ret;
+
+ nvme_complete_failed_req(req);
+ return BLK_STS_OK;
+}
+
#ifdef CONFIG_NVME_MULTIPATH
static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
{
--
2.16.4
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-01-05 7:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 7:19 [PATCH 0/6] avoid repeated request completion and IO error Chao Leng
2021-01-05 7:19 ` [PATCH 1/6] blk-mq: introduce blk_mq_set_request_complete Chao Leng
2021-01-05 19:16 ` Minwoo Im
2021-01-06 2:29 ` Chao Leng
2021-01-05 7:19 ` Chao Leng [this message]
2021-01-05 19:11 ` [PATCH 2/6] nvme-core: introduce complete failed request Minwoo Im
2021-01-06 2:31 ` Chao Leng
2021-01-05 7:19 ` [PATCH 3/6] nvme-fabrics: avoid repeated request completion for nvmf_fail_nonready_command Chao Leng
2021-01-05 7:19 ` [PATCH 4/6] nvme-rdma: avoid IO error and repeated request completion Chao Leng
2021-01-05 7:19 ` [PATCH 5/6] nvme-tcp: " Chao Leng
2021-01-05 7:19 ` [PATCH 6/6] nvme-fc: " 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=20210105071936.25097-3-lengchao@huawei.com \
--to=lengchao@huawei.com \
--cc=axboe@fb.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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