From: Chao Leng <lengchao@huawei.com>
To: Sagi Grimberg <sagi@grimberg.me>, <linux-nvme@lists.infradead.org>
Cc: kbusch@kernel.org, axboe@fb.com, hch@lst.de
Subject: Re: [PATCH 0/3] avoid race between time out and tear down
Date: Wed, 21 Oct 2020 10:16:41 +0800 [thread overview]
Message-ID: <3d5b96dd-4e0f-758a-4175-e69fef0b8c34@huawei.com> (raw)
In-Reply-To: <9e1966b0-d471-0043-7fdb-e0f535571feb@grimberg.me>
On 2020/10/21 2:43, Sagi Grimberg wrote:
>
>> Avoid race between time out and tear down for rdma and tcp.
>
> This patchset overall looks good, but we still need the patch that
> avoids double completion:
>
> --
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 629b025685d1..46428ff0b0fc 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -2175,7 +2175,7 @@ static void nvme_tcp_complete_timed_out(struct request *rq)
> /* fence other contexts that may complete the command */
> mutex_lock(&to_tcp_ctrl(ctrl)->teardown_lock);
> nvme_tcp_stop_queue(ctrl, nvme_tcp_queue_id(req->queue));
> - if (!blk_mq_request_completed(rq)) {
> + if (blk_mq_request_started(rq) && !blk_mq_request_completed(rq)) {
Yes, this patch is need. and samely for nvme_cancel_request.
This will fix the race with asynchronous completion.
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e85f6304efd7..1e838d952096 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -338,7 +338,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
"Cancelling I/O %d", req->tag);
/* don't abort one completed request */
- if (blk_mq_request_completed(req))
+ if (blk_mq_request_completed(req) || !blk_mq_request_started(rq))
return true;
nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
--
> nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD;
> blk_mq_complete_request_sync(rq);
> }
> --
> .
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-10-21 2:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 9:08 [PATCH 0/3] avoid race between time out and tear down Chao Leng
2020-10-20 18:43 ` Sagi Grimberg
2020-10-21 2:16 ` Chao Leng [this message]
2020-10-21 4:59 ` Sagi Grimberg
2020-10-21 6:51 ` Chao Leng
2020-10-21 8:53 ` Sagi Grimberg
2020-10-22 1:58 ` 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=3d5b96dd-4e0f-758a-4175-e69fef0b8c34@huawei.com \
--to=lengchao@huawei.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@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