public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mike Snitzer <snitzer@redhat.com>
To: Helen Koike <helen.koike@collabora.com>
Cc: dm-devel@redhat.com, kernel@collabora.com,
	linux-kernel@vger.kernel.org, Alasdair Kergon <agk@redhat.com>
Subject: Re: dm ioctl: fix hang in early create error condition
Date: Mon, 13 May 2019 21:37:16 -0400	[thread overview]
Message-ID: <20190514013716.GA10260@lobo> (raw)
In-Reply-To: <20190513192530.1167-1-helen.koike@collabora.com>

On Mon, May 13 2019 at  3:25P -0400,
Helen Koike <helen.koike@collabora.com> wrote:

> The dm_early_create() function (which deals with "dm-mod.create=" kernel
> command line option) calls dm_hash_insert() who gets an extra reference
> to the md object.
> 
> In case of failure, this reference wasn't being released, causing
> dm_destroy() to hang, thus hanging the whole boot process.
> 
> Fix this by calling __hash_remove() in the error path.
> 
> Fixes: 6bbc923dfcf57d ("dm: add support to directly boot to a mapped device")
> Cc: stable@vger.kernel.org
> Signed-off-by: Helen Koike <helen.koike@collabora.com>
> 
> ---
> Hi,
> 
> I tested this patch by adding a new test case in the following test
> script:
> 
> https://gitlab.collabora.com/koike/dm-cmdline-test/commit/d2d7a0ee4a49931cdb59f08a837b516c2d5d743d
> 
> This test was failing, but with this patch it works correctly.
> 
> Thanks
> Helen

Thanks for the patch but I'd prefer the following simpler fix.  What do
you think?

That said, I can provide a follow-on patch (inspired by the patch you
provided) that encourages more code sharing between dm_early_create()
and dev_create() by factoring out __dev_create().

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index c740153b4e52..0eb0b462c736 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -2117,6 +2117,7 @@ int __init dm_early_create(struct dm_ioctl *dmi,
 err_destroy_table:
 	dm_table_destroy(t);
 err_destroy_dm:
+	(void) __hash_remove(__find_device_hash_cell(dmi));
 	dm_put(md);
 	dm_destroy(md);
 	return r;

  reply	other threads:[~2019-05-14  1:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-13 19:25 [PATCH] dm ioctl: fix hang in early create error condition Helen Koike
2019-05-14  1:37 ` Mike Snitzer [this message]
2019-05-15 16:12   ` Helen Koike
2019-05-15 16:20     ` Mike Snitzer

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=20190514013716.GA10260@lobo \
    --to=snitzer@redhat.com \
    --cc=agk@redhat.com \
    --cc=dm-devel@redhat.com \
    --cc=helen.koike@collabora.com \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    /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