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 v3 4/5] nvme-rdma: avoid IO error for nvme native multipath
Date: Thu, 21 Jan 2021 15:03:29 +0800 [thread overview]
Message-ID: <20210121070330.19701-5-lengchao@huawei.com> (raw)
In-Reply-To: <20210121070330.19701-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 will return
BLK_STS_IOERR to blk-mq. The request is completed with BLK_STS_IOERR
instead of fail over to retry.
queue_rq need call nvme_complete_rq to complete the request with
NVME_SC_HOST_PATH_ERROR, the request will fail over to retry if needed.
Signed-off-by: Chao Leng <lengchao@huawei.com>
---
drivers/nvme/host/rdma.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index cf6c49d09c82..5fb0838a5f8b 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -2030,6 +2030,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
bool queue_ready = test_bit(NVME_RDMA_Q_LIVE, &queue->flags);
blk_status_t ret;
int err;
+ bool driver_error = false;
WARN_ON_ONCE(rq->tag < 0);
@@ -2077,8 +2078,10 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
err = nvme_rdma_post_send(queue, sqe, req->sge, req->num_sge,
req->mr ? &req->reg_wr.wr : NULL);
- if (unlikely(err))
+ if (unlikely(err)) {
+ driver_error = true;
goto err_unmap;
+ }
return BLK_STS_OK;
@@ -2093,6 +2096,10 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
unmap_qe:
ib_dma_unmap_single(dev, req->sqe.dma, sizeof(struct nvme_command),
DMA_TO_DEVICE);
+ if (driver_error && ret == BLK_STS_IOERR) {
+ nvme_complete_failed_req(rq);
+ ret = BLK_STS_OK;
+ }
return ret;
}
--
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-21 7:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 7:03 [PATCH v3 0/5] avoid double request completion and IO error Chao Leng
2021-01-21 7:03 ` [PATCH v3 1/5] blk-mq: introduce blk_mq_set_request_complete Chao Leng
2021-01-21 8:40 ` Christoph Hellwig
2021-01-22 1:46 ` Chao Leng
2021-01-21 7:03 ` [PATCH v3 2/5] nvme-core: introduce complete failed request Chao Leng
2021-01-21 8:41 ` Christoph Hellwig
2021-01-22 1:46 ` Chao Leng
2021-01-21 7:03 ` [PATCH v3 3/5] nvme-fabrics: avoid double request completion for nvmf_fail_nonready_command Chao Leng
2021-01-21 8:58 ` Hannes Reinecke
2021-01-21 9:00 ` Christoph Hellwig
2021-01-21 9:27 ` Hannes Reinecke
2021-01-22 1:50 ` Chao Leng
2021-01-22 1:48 ` Chao Leng
2021-01-21 7:03 ` Chao Leng [this message]
2021-01-21 7:03 ` [PATCH v3 5/5] nvme-fc: avoid IO error for nvme native multipath 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=20210121070330.19701-5-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