From: Mike Christie <mchristi@redhat.com>
To: Sun Ke <sunke32@huawei.com>,
josef@toxicpanda.com, axboe@kernel.dk,
linux-block@vger.kernel.org, nbd@other.debian.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nbd: add a missed nbd_config_put() in nbd_xmit_timeout()
Date: Mon, 12 Aug 2019 10:34:44 -0500 [thread overview]
Message-ID: <5D518714.5000408@redhat.com> (raw)
In-Reply-To: <1565613086-13776-1-git-send-email-sunke32@huawei.com>
On 08/12/2019 07:31 AM, Sun Ke wrote:
> When try to get the lock failed, before return, execute the
> nbd_config_put() to decrease the nbd->config_refs.
>
> If the nbd->config_refs is added but not decreased. Then will not
> execute nbd_clear_sock() in nbd_config_put(). bd->task_setup will
> not be cleared away. Finally, print"Device being setup by another
> task" in nbd_add_sock() and nbd device can not be reused.
>
> Fixes: 8f3ea35929a0 ("nbd: handle unexpected replies better")
> Signed-off-by: Sun Ke <sunke32@huawei.com>
> ---
> drivers/block/nbd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index e21d2de..a69a90a 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -357,8 +357,10 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
> }
> config = nbd->config;
>
> - if (!mutex_trylock(&cmd->lock))
> + if (!mutex_trylock(&cmd->lock)) {
> + nbd_config_put(nbd);
> return BLK_EH_RESET_TIMER;
> + }
>
> if (config->num_connections > 1) {
> dev_err_ratelimited(nbd_to_dev(nbd),
>
I just sent the same patch
https://www.spinics.net/lists/linux-block/msg43718.html
here
https://www.spinics.net/lists/linux-block/msg43715.html
so it looks good to me.
Reviewed-by: Mike Christie <mchristi@redhat.com>
next prev parent reply other threads:[~2019-08-12 15:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 12:31 [PATCH] nbd: add a missed nbd_config_put() in nbd_xmit_timeout() Sun Ke
2019-08-12 15:34 ` Mike Christie [this message]
2019-08-13 4:28 ` sunke (E)
2019-08-15 1:27 ` sunke (E)
2019-08-15 3:13 ` Mike Christie
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=5D518714.5000408@redhat.com \
--to=mchristi@redhat.com \
--cc=axboe@kernel.dk \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=sunke32@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;
as well as URLs for NNTP newsgroup(s).