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>, <lengchao@huawei.com>,
	<linux-block@vger.kernel.org>, <axboe@kernel.dk>
Subject: [PATCH 3/6] nvme-fabrics: avoid repeated request completion for nvmf_fail_nonready_command
Date: Tue, 5 Jan 2021 15:19:33 +0800	[thread overview]
Message-ID: <20210105071936.25097-4-lengchao@huawei.com> (raw)
In-Reply-To: <20210105071936.25097-1-lengchao@huawei.com>

The request may be completed with NVME_SC_HOST_PATH_ERROR in
nvmf_fail_nonready_command. The state of request will be changed to
MQ_RQ_IN_FLIGHT before call nvme_complete_rq. If free the request
asynchronously such as in nvme_submit_user_cmd, in extreme scenario
the request will be repeated freed in tear down.
Nvmf_fail_nonready_command do not need calling blk_mq_start_request
before complete the request. Nvmf_fail_nonready_command should set
the state of request to MQ_RQ_COMPLETE before complete the request.

Signed-off-by: Chao Leng <lengchao@huawei.com>
---
 drivers/nvme/host/fabrics.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 72ac00173500..874e4320e214 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -553,9 +553,7 @@ blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
 	    !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
 		return BLK_STS_RESOURCE;
 
-	nvme_req(rq)->status = NVME_SC_HOST_PATH_ERROR;
-	blk_mq_start_request(rq);
-	nvme_complete_rq(rq);
+	nvme_complete_failed_req(rq);
 	return BLK_STS_OK;
 }
 EXPORT_SYMBOL_GPL(nvmf_fail_nonready_command);
-- 
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, lengchao@huawei.com, kbusch@kernel.org, hch@lst.de
Subject: [PATCH 3/6] nvme-fabrics: avoid repeated request completion for nvmf_fail_nonready_command
Date: Tue, 5 Jan 2021 15:19:33 +0800	[thread overview]
Message-ID: <20210105071936.25097-4-lengchao@huawei.com> (raw)
In-Reply-To: <20210105071936.25097-1-lengchao@huawei.com>

The request may be completed with NVME_SC_HOST_PATH_ERROR in
nvmf_fail_nonready_command. The state of request will be changed to
MQ_RQ_IN_FLIGHT before call nvme_complete_rq. If free the request
asynchronously such as in nvme_submit_user_cmd, in extreme scenario
the request will be repeated freed in tear down.
Nvmf_fail_nonready_command do not need calling blk_mq_start_request
before complete the request. Nvmf_fail_nonready_command should set
the state of request to MQ_RQ_COMPLETE before complete the request.

Signed-off-by: Chao Leng <lengchao@huawei.com>
---
 drivers/nvme/host/fabrics.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 72ac00173500..874e4320e214 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -553,9 +553,7 @@ blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
 	    !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
 		return BLK_STS_RESOURCE;
 
-	nvme_req(rq)->status = NVME_SC_HOST_PATH_ERROR;
-	blk_mq_start_request(rq);
-	nvme_complete_rq(rq);
+	nvme_complete_failed_req(rq);
 	return BLK_STS_OK;
 }
 EXPORT_SYMBOL_GPL(nvmf_fail_nonready_command);
-- 
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-05  7:20 UTC|newest]

Thread overview: 22+ 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 ` Chao Leng
2021-01-05  7:19 ` [PATCH 1/6] blk-mq: introduce blk_mq_set_request_complete Chao Leng
2021-01-05  7:19   ` Chao Leng
2021-01-05 19:16   ` Minwoo Im
2021-01-05 19:16     ` Minwoo Im
2021-01-06  2:29     ` Chao Leng
2021-01-06  2:29       ` Chao Leng
2021-01-05  7:19 ` [PATCH 2/6] nvme-core: introduce complete failed request Chao Leng
2021-01-05  7:19   ` Chao Leng
2021-01-05 19:11   ` Minwoo Im
2021-01-05 19:11     ` Minwoo Im
2021-01-06  2:31     ` Chao Leng
2021-01-06  2:31       ` Chao Leng
2021-01-05  7:19 ` Chao Leng [this message]
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   ` Chao Leng
2021-01-05  7:19 ` [PATCH 5/6] nvme-tcp: " Chao Leng
2021-01-05  7:19   ` Chao Leng
2021-01-05  7:19 ` [PATCH 6/6] nvme-fc: " Chao Leng
2021-01-05  7:19   ` 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-4-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.