From: Kevin Wolf <kwolf@redhat.com>
To: Sergio Lopez <slp@redhat.com>
Cc: mreitz@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org,
qemu-block@nongnu.org, mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH v2] virtio-blk: schedule virtio_notify_config to run on main context
Date: Mon, 16 Sep 2019 10:09:58 +0200 [thread overview]
Message-ID: <20190916080958.GD10930@localhost.localdomain> (raw)
In-Reply-To: <20190913105626.22353-1-slp@redhat.com>
Am 13.09.2019 um 12:56 hat Sergio Lopez geschrieben:
> virtio_notify_config() needs to acquire the global mutex, which isn't
> allowed from an iothread, and may lead to a deadlock like this:
>
> - main thead
> * Has acquired: qemu_global_mutex.
> * Is trying the acquire: iothread AioContext lock via
> AIO_WAIT_WHILE (after aio_poll).
>
> - iothread
> * Has acquired: AioContext lock.
> * Is trying to acquire: qemu_global_mutex (via
> virtio_notify_config->prepare_mmio_access).
>
> If virtio_blk_resize() is called from an iothread, schedule
> virtio_notify_config() to be run in the main context BH.
>
> Signed-off-by: Sergio Lopez <slp@redhat.com>
> ---
> Changelog
>
> v2:
> - Use aio_bh_schedule_oneshot instead of scheduling a coroutine
> (thanks Kevin Wolf).
> - Switch from RFC to v2 patch.
> ---
> hw/block/virtio-blk.c | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index 18851601cb..669dc60f5b 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -16,6 +16,7 @@
> #include "qemu/iov.h"
> #include "qemu/module.h"
> #include "qemu/error-report.h"
> +#include "qemu/main-loop.h"
> #include "trace.h"
> #include "hw/block/block.h"
> #include "hw/qdev-properties.h"
> @@ -1086,11 +1087,29 @@ static int virtio_blk_load_device(VirtIODevice *vdev, QEMUFile *f,
> return 0;
> }
>
> +static void virtio_resize_cb(void *opaque)
> +{
> + VirtIODevice *vdev = opaque;
> +
> + assert(qemu_get_current_aio_context() == qemu_get_aio_context());
> + virtio_notify_config(vdev);
> +}
> +
> static void virtio_blk_resize(void *opaque)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
>
> - virtio_notify_config(vdev);
> + if (qemu_get_current_aio_context() != qemu_get_aio_context()) {
> + /*
> + * virtio_notify_config() needs to acquire the global mutex,
> + * so it can't be called from an iothread. Instead, schedule
> + * it to be run in the main context BH.
> + */
> + aio_bh_schedule_oneshot(qemu_get_aio_context(),
> + virtio_resize_cb, vdev);
> + } else {
> + virtio_notify_config(vdev);
Let's call virtio_resize_cb() instead to keep both code paths the same.
Otherwise, we might add more code to virtio_resize_cb() later and miss
that it must be duplicated here.
Kevin
prev parent reply other threads:[~2019-09-16 8:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 10:56 [Qemu-devel] [PATCH v2] virtio-blk: schedule virtio_notify_config to run on main context Sergio Lopez
2019-09-13 20:29 ` [Qemu-devel] [Qemu-block] " John Snow
2019-09-16 8:09 ` Kevin Wolf [this message]
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=20190916080958.GD10930@localhost.localdomain \
--to=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=slp@redhat.com \
--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).