From: Ming Lei <ming.lei@redhat.com>
To: Yu Kuai <yukuai3@huawei.com>
Cc: josef@toxicpanda.com, axboe@kernel.dk, hch@infradead.org,
linux-block@vger.kernel.org, nbd@other.debian.org,
linux-kernel@vger.kernel.org, yi.zhang@huawei.com
Subject: Re: [PATCH v7 4/6] nbd: don't start request if nbd_queue_rq() failed
Date: Thu, 16 Sep 2021 15:58:10 +0800 [thread overview]
Message-ID: <YUL5EqT6eA0shjJZ@T590> (raw)
In-Reply-To: <20210915092010.2087371-5-yukuai3@huawei.com>
On Wed, Sep 15, 2021 at 05:20:08PM +0800, Yu Kuai wrote:
> Currently, blk_mq_end_request() will be called if nbd_queue_rq()
> failed, thus start request in such situation is useless.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/block/nbd.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index c724a5bd7fa4..22c91d8901f6 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -934,7 +934,6 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
> if (!refcount_inc_not_zero(&nbd->config_refs)) {
> dev_err_ratelimited(disk_to_dev(nbd->disk),
> "Socks array is empty\n");
> - blk_mq_start_request(req);
> return -EINVAL;
> }
> config = nbd->config;
> @@ -943,7 +942,6 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
> dev_err_ratelimited(disk_to_dev(nbd->disk),
> "Attempted send on invalid socket\n");
> nbd_config_put(nbd);
> - blk_mq_start_request(req);
> return -EINVAL;
> }
> cmd->status = BLK_STS_OK;
> @@ -967,7 +965,6 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index)
> */
> sock_shutdown(nbd);
> nbd_config_put(nbd);
> - blk_mq_start_request(req);
> return -EIO;
> }
It is basically a partial revert of the following fix, care to add commit log
about why removing these blk_mq_start_request() is safe?
commit 6a468d5990ecd1c2d07dd85f8633bbdd0ba61c40
Author: Josef Bacik <jbacik@fb.com>
Date: Mon Nov 6 16:11:58 2017 -0500
nbd: don't start req until after the dead connection logic
Thanks,
Ming
next prev parent reply other threads:[~2021-09-16 7:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 9:20 [PATCH v7 0/6] handle unexpected message from server Yu Kuai
2021-09-15 9:20 ` [PATCH v7 1/6] nbd: don't handle response without a corresponding request message Yu Kuai
2021-09-15 9:20 ` [PATCH v7 2/6] nbd: make sure request completion won't concurrent Yu Kuai
2021-09-16 7:53 ` Ming Lei
2021-09-15 9:20 ` [PATCH v7 3/6] nbd: check sock index in nbd_read_stat() Yu Kuai
2021-09-15 9:20 ` [PATCH v7 4/6] nbd: don't start request if nbd_queue_rq() failed Yu Kuai
2021-09-16 7:58 ` Ming Lei [this message]
2021-09-15 9:20 ` [PATCH v7 5/6] nbd: partition nbd_read_stat() into nbd_read_reply() and nbd_handle_reply() Yu Kuai
2021-09-16 8:00 ` Ming Lei
2021-09-15 9:20 ` [PATCH v7 6/6] nbd: fix uaf in nbd_handle_reply() Yu Kuai
2021-09-16 8:04 ` Ming Lei
2021-09-16 8:47 ` yukuai (C)
2021-09-16 9:06 ` Ming Lei
2021-09-16 9:14 ` yukuai (C)
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=YUL5EqT6eA0shjJZ@T590 \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.com \
/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