From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-stable@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] block: fix QEMU crash with scsi-hd and drive_del
Date: Wed, 16 May 2018 18:53:22 +0200 [thread overview]
Message-ID: <20180516185322.17556153@bahia.lan> (raw)
In-Reply-To: <152646971421.34839.18198173866060880395.stgit@bahia.lan>
Heh, of course I meant qemu-stable@nongnu.org ;)
On Wed, 16 May 2018 13:21:54 +0200
Greg Kurz <groug@kaod.org> wrote:
> Removing a drive with drive_del while it is being used to run an I/O
> intensive workload can cause QEMU to crash.
>
> An AIO flush can yield at some point:
>
> blk_aio_flush_entry()
> blk_co_flush(blk)
> bdrv_co_flush(blk->root->bs)
> ...
> qemu_coroutine_yield()
>
> and let the HMP command to run, free blk->root and give control
> back to the AIO flush:
>
> hmp_drive_del()
> blk_remove_bs()
> bdrv_root_unref_child(blk->root)
> child_bs = blk->root->bs
> bdrv_detach_child(blk->root)
> bdrv_replace_child(blk->root, NULL)
> blk->root->bs = NULL
> g_free(blk->root) <============== blk->root becomes stale
> bdrv_unref(child_bs)
> bdrv_delete(child_bs)
> bdrv_close()
> bdrv_drained_begin()
> bdrv_do_drained_begin()
> bdrv_drain_recurse()
> aio_poll()
> ...
> qemu_coroutine_switch()
>
> and the AIO flush completion ends up dereferencing blk->root:
>
> blk_aio_complete()
> scsi_aio_complete()
> blk_get_aio_context(blk)
> bs = blk_bs(blk)
> ie, bs = blk->root ? blk->root->bs : NULL
> ^^^^^
> stale
>
> The solution to this user-after-free situation is is to clear
> blk->root before calling bdrv_unref() in bdrv_detach_child(),
> and let blk_get_aio_context() fall back to the main loop context
> since the BDS has been removed.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>
> The use-after-free condition is easy to reproduce with a stress-ng
> run in the guest:
>
> -device virtio-scsi-pci,id=scsi1 \
> -drive file=/home/greg/images/scratch.qcow2,format=qcow2,if=none,id=drive1 \
> -device scsi-hd,bus=scsi1.0,drive=drive1,id=scsi-hd1
>
> # stress-ng --hdd 0 --aggressive
>
> and doing drive_del from the QEMU monitor while stress-ng is still running:
>
> (qemu) drive_del drive1
>
> The crash is less easy to hit though, as it depends on the bs field
> of the stale blk->root to have a non-NULL value that eventually breaks
> something when it gets dereferenced. The following patch simulates
> that, and allows to validate the fix:
>
> --- a/block.c
> +++ b/block.c
> @@ -2127,6 +2127,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
>
> static void bdrv_detach_child(BdrvChild *child)
> {
> + BlockDriverState *bs = child->bs;
> +
> if (child->next.le_prev) {
> QLIST_REMOVE(child, next);
> child->next.le_prev = NULL;
> @@ -2135,7 +2137,15 @@ static void bdrv_detach_child(BdrvChild *child)
> bdrv_replace_child(child, NULL);
>
> g_free(child->name);
> - g_free(child);
> + /* Poison the BdrvChild instead of freeing it, in order to break blk_bs()
> + * if the blk still has a pointer to this BdrvChild in blk->root.
> + */
> + if (atomic_read(&bs->in_flight)) {
> + child->bs = (BlockDriverState *) -1;
> + fprintf(stderr, "\nPoisonned BdrvChild %p\n", child);
> + } else {
> + g_free(child);
> + }
> }
>
> void bdrv_root_unref_child(BdrvChild *child)
> ---
> block/block-backend.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/block/block-backend.c b/block/block-backend.c
> index 681b240b1268..ed9434e236b9 100644
> --- a/block/block-backend.c
> +++ b/block/block-backend.c
> @@ -756,6 +756,7 @@ void blk_remove_bs(BlockBackend *blk)
> {
> ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
> BlockDriverState *bs;
> + BdrvChild *root;
>
> notifier_list_notify(&blk->remove_bs_notifiers, blk);
> if (tgm->throttle_state) {
> @@ -768,8 +769,9 @@ void blk_remove_bs(BlockBackend *blk)
>
> blk_update_root_state(blk);
>
> - bdrv_root_unref_child(blk->root);
> + root = blk->root;
> blk->root = NULL;
> + bdrv_root_unref_child(root);
> }
>
> /*
>
>
next prev parent reply other threads:[~2018-05-16 16:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-16 11:21 [Qemu-devel] [PATCH] block: fix QEMU crash with scsi-hd and drive_del Greg Kurz
2018-05-16 15:41 ` Greg KH
2018-05-16 16:53 ` Greg Kurz [this message]
2018-05-18 15:32 ` Stefan Hajnoczi
2018-05-23 14:46 ` Greg Kurz
2018-05-24 6:04 ` Paolo Bonzini
2018-05-24 8:05 ` Stefan Hajnoczi
2018-05-24 8:32 ` Greg Kurz
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=20180516185322.17556153@bahia.lan \
--to=groug@kaod.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=stefanha@redhat.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).