LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Yu Kuai <yukuai3@huawei.com>
To: <axboe@kernel.dk>, <josef@toxicpanda.com>, <ming.lei@redhat.com>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<nbd@other.debian.org>, <yukuai3@huawei.com>,
<yi.zhang@huawei.com>
Subject: [PATCH v4 2/6] nbd: convert to use blk_mq_find_and_get_req()
Date: Tue, 7 Sep 2021 22:01:50 +0800 [thread overview]
Message-ID: <20210907140154.2134091-3-yukuai3@huawei.com> (raw)
In-Reply-To: <20210907140154.2134091-1-yukuai3@huawei.com>
blk_mq_tag_to_rq() can only ensure to return valid request in
following situation:
1) client send request message to server first
submit_bio
...
blk_mq_get_tag
...
blk_mq_get_driver_tag
...
nbd_queue_rq
nbd_handle_cmd
nbd_send_cmd
2) client receive respond message from server
recv_work
nbd_read_stat
blk_mq_tag_to_rq
If step 1) is missing, blk_mq_tag_to_rq() will return a stale
request, which might be freed. Thus convert to use
blk_mq_find_and_get_req() to make sure the returned request is not
freed. However, there are still some problems if the request is
started, and this will be fixed in next patch.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/block/nbd.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5170a630778d..920da390635c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -718,12 +718,13 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
tag = nbd_handle_to_tag(handle);
hwq = blk_mq_unique_tag_to_hwq(tag);
if (hwq < nbd->tag_set.nr_hw_queues)
- req = blk_mq_tag_to_rq(nbd->tag_set.tags[hwq],
- blk_mq_unique_tag_to_tag(tag));
+ req = blk_mq_find_and_get_req(nbd->tag_set.tags[hwq],
+ blk_mq_unique_tag_to_tag(tag));
if (!req || !blk_mq_request_started(req)) {
dev_err(disk_to_dev(nbd->disk), "Unexpected reply (%d) %p\n",
tag, req);
- return ERR_PTR(-ENOENT);
+ ret = -ENOENT;
+ goto put_req;
}
trace_nbd_header_received(req, handle);
cmd = blk_mq_rq_to_pdu(req);
@@ -785,6 +786,9 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
out:
trace_nbd_payload_received(req, handle);
mutex_unlock(&cmd->lock);
+put_req:
+ if (req)
+ blk_mq_put_rq_ref(req);
return ret ? ERR_PTR(ret) : cmd;
}
--
2.31.1
next prev parent reply other threads:[~2021-09-07 13:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 14:01 [PATCH v4 0/6] handle unexpected message from server Yu Kuai
2021-09-07 14:01 ` [PATCH v4 1/6] blk-mq: export two symbols to get request by tag Yu Kuai
2021-09-07 14:01 ` Yu Kuai [this message]
2021-09-08 7:30 ` [PATCH v4 2/6] nbd: convert to use blk_mq_find_and_get_req() Ming Lei
2021-09-08 7:37 ` yukuai (C)
2021-09-08 8:00 ` Ming Lei
2021-09-08 8:29 ` yukuai (C)
2021-09-08 9:27 ` Ming Lei
2021-09-08 11:03 ` yukuai (C)
2021-09-07 14:01 ` [PATCH v4 3/6] nbd: don't handle response without a corresponding request message Yu Kuai
2021-09-07 14:01 ` [PATCH v4 4/6] nbd: make sure request completion won't concurrent Yu Kuai
2021-09-07 14:01 ` [PATCH v4 5/6] nbd: check sock index in nbd_read_stat() Yu Kuai
2021-09-07 14:01 ` [PATCH v4 6/6] nbd: don't start request if nbd_queue_rq() failed Yu Kuai
2021-09-09 6:41 ` Christoph Hellwig
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=20210907140154.2134091-3-yukuai3@huawei.com \
--to=yukuai3@huawei.com \
--cc=axboe@kernel.dk \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=nbd@other.debian.org \
--cc=yi.zhang@huawei.com \
--subject='Re: [PATCH v4 2/6] nbd: convert to use blk_mq_find_and_get_req()' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).