All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chao Leng <lengchao@huawei.com>
To: <linux-nvme@lists.infradead.org>
Cc: <kbusch@kernel.org>, <axboe@fb.com>, <hch@lst.de>,
	<sagi@grimberg.me>, <linux-block@vger.kernel.org>,
	<axboe@kernel.dk>
Subject: [PATCH v4 2/5] nvme-core: introduce complete failed request
Date: Tue, 26 Jan 2021 16:15:36 +0800	[thread overview]
Message-ID: <20210126081539.13320-3-lengchao@huawei.com> (raw)
In-Reply-To: <20210126081539.13320-1-lengchao@huawei.com>

Work with nvme native multipath, if a path related error occurs when
queue_rq call HBA drive to send request, queue_rq need complete the
request with NVME_SC_HOST_PATH_ERROR, the request will fail over to
retry if needed.
So introduce nvme_complete_failed_req for queue_rq and
nvmf_fail_nonready_command.

Signed-off-by: Chao Leng <lengchao@huawei.com>
---
 drivers/nvme/host/core.c | 8 ++++++++
 drivers/nvme/host/nvme.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 8caf9b34734d..9aad4111d9cd 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -356,6 +356,14 @@ void nvme_complete_rq(struct request *req)
 }
 EXPORT_SYMBOL_GPL(nvme_complete_rq);
 
+void nvme_complete_failed_rq(struct request *req, u16 status)
+{
+	nvme_req(req)->status = status;
+	blk_mq_set_request_complete(req);
+	nvme_complete_rq(req);
+}
+EXPORT_SYMBOL_GPL(nvme_complete_failed_rq);
+
 bool nvme_cancel_request(struct request *req, void *data, bool reserved)
 {
 	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 88a6b97247f5..f0f609644309 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -575,6 +575,7 @@ static inline bool nvme_is_aen_req(u16 qid, __u16 command_id)
 }
 
 void nvme_complete_rq(struct request *req);
+void nvme_complete_failed_rq(struct request *req, u16 status);
 bool nvme_cancel_request(struct request *req, void *data, bool reserved);
 bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
 		enum nvme_ctrl_state new_state);
-- 
2.16.4


WARNING: multiple messages have this Message-ID (diff)
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, kbusch@kernel.org, hch@lst.de
Subject: [PATCH v4 2/5] nvme-core: introduce complete failed request
Date: Tue, 26 Jan 2021 16:15:36 +0800	[thread overview]
Message-ID: <20210126081539.13320-3-lengchao@huawei.com> (raw)
In-Reply-To: <20210126081539.13320-1-lengchao@huawei.com>

Work with nvme native multipath, if a path related error occurs when
queue_rq call HBA drive to send request, queue_rq need complete the
request with NVME_SC_HOST_PATH_ERROR, the request will fail over to
retry if needed.
So introduce nvme_complete_failed_req for queue_rq and
nvmf_fail_nonready_command.

Signed-off-by: Chao Leng <lengchao@huawei.com>
---
 drivers/nvme/host/core.c | 8 ++++++++
 drivers/nvme/host/nvme.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 8caf9b34734d..9aad4111d9cd 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -356,6 +356,14 @@ void nvme_complete_rq(struct request *req)
 }
 EXPORT_SYMBOL_GPL(nvme_complete_rq);
 
+void nvme_complete_failed_rq(struct request *req, u16 status)
+{
+	nvme_req(req)->status = status;
+	blk_mq_set_request_complete(req);
+	nvme_complete_rq(req);
+}
+EXPORT_SYMBOL_GPL(nvme_complete_failed_rq);
+
 bool nvme_cancel_request(struct request *req, void *data, bool reserved)
 {
 	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 88a6b97247f5..f0f609644309 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -575,6 +575,7 @@ static inline bool nvme_is_aen_req(u16 qid, __u16 command_id)
 }
 
 void nvme_complete_rq(struct request *req);
+void nvme_complete_failed_rq(struct request *req, u16 status);
 bool nvme_cancel_request(struct request *req, void *data, bool reserved);
 bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
 		enum nvme_ctrl_state new_state);
-- 
2.16.4


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

  parent reply	other threads:[~2021-01-26 18:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-26  8:15 [PATCH v4 0/5] avoid double request completion and IO error Chao Leng
2021-01-26  8:15 ` Chao Leng
2021-01-26  8:15 ` [PATCH v4 1/5] blk-mq: introduce blk_mq_set_request_complete Chao Leng
2021-01-26  8:15   ` Chao Leng
2021-01-27 16:40   ` Christoph Hellwig
2021-01-27 16:40     ` Christoph Hellwig
2021-01-28  1:34     ` Chao Leng
2021-01-28  1:34       ` Chao Leng
2021-01-26  8:15 ` Chao Leng [this message]
2021-01-26  8:15   ` [PATCH v4 2/5] nvme-core: introduce complete failed request Chao Leng
2021-01-26  8:15 ` [PATCH v4 3/5] nvme-fabrics: avoid double request completion for nvmf_fail_nonready_command Chao Leng
2021-01-26  8:15   ` Chao Leng
2021-01-26  8:15 ` [PATCH v4 4/5] nvme-rdma: avoid IO error for nvme native multipath Chao Leng
2021-01-26  8:15   ` Chao Leng
2021-01-28  8:39   ` Sagi Grimberg
2021-01-28  8:39     ` Sagi Grimberg
2021-01-28  9:31     ` Chao Leng
2021-01-28  9:31       ` Chao Leng
2021-01-29  1:35       ` Sagi Grimberg
2021-01-29  1:35         ` Sagi Grimberg
2021-01-29  2:48         ` Chao Leng
2021-01-29  2:48           ` Chao Leng
2021-01-29  3:24           ` Sagi Grimberg
2021-01-29  3:24             ` Sagi Grimberg
2021-01-29  3:30             ` Chao Leng
2021-01-29  3:30               ` Chao Leng
2021-01-29  3:37               ` Sagi Grimberg
2021-01-29  3:37                 ` Sagi Grimberg
2021-01-29  3:50                 ` Chao Leng
2021-01-29  3:50                   ` Chao Leng
2021-01-29  3:37             ` Chao Leng
2021-01-29  3:37               ` Chao Leng
2021-01-26  8:15 ` [PATCH v4 5/5] nvme-fc: " Chao Leng
2021-01-26  8:15   ` 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=20210126081539.13320-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.