2fe1fc7b2d
- kvm-virtio-introduce-macro-VIRTIO_CONFIG_IRQ_IDX.patch [bz#1905805] - kvm-virtio-pci-decouple-notifier-from-interrupt-process.patch [bz#1905805] - kvm-virtio-pci-decouple-the-single-vector-from-the-inter.patch [bz#1905805] - kvm-vhost-introduce-new-VhostOps-vhost_set_config_call.patch [bz#1905805] - kvm-vhost-vdpa-add-support-for-config-interrupt.patch [bz#1905805] - kvm-virtio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-vhost-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-net-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-mmio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-pci-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-s390x-s390-virtio-ccw-Activate-zPCI-features-on-s390.patch [bz#2159408] - kvm-vhost-fix-vq-dirty-bitmap-syncing-when-vIOMMU-is-ena.patch [bz#2124856] - kvm-block-drop-bdrv_remove_filter_or_cow_child.patch [bz#2155112] - kvm-qed-Don-t-yield-in-bdrv_qed_co_drain_begin.patch [bz#2155112] - kvm-test-bdrv-drain-Don-t-yield-in-.bdrv_co_drained_begi.patch [bz#2155112] - kvm-block-Revert-.bdrv_drained_begin-end-to-non-coroutin.patch [bz#2155112] - kvm-block-Remove-drained_end_counter.patch [bz#2155112] - kvm-block-Inline-bdrv_drain_invoke.patch [bz#2155112] - kvm-block-Fix-locking-for-bdrv_reopen_queue_child.patch [bz#2155112] - kvm-block-Drain-individual-nodes-during-reopen.patch [bz#2155112] - kvm-block-Don-t-use-subtree-drains-in-bdrv_drop_intermed.patch [bz#2155112] - kvm-stream-Replace-subtree-drain-with-a-single-node-drai.patch [bz#2155112] - kvm-block-Remove-subtree-drains.patch [bz#2155112] - kvm-block-Call-drain-callbacks-only-once.patch [bz#2155112] - kvm-block-Remove-ignore_bds_parents-parameter-from-drain.patch [bz#2155112] - kvm-block-Drop-out-of-coroutine-in-bdrv_do_drained_begin.patch [bz#2155112] - kvm-block-Don-t-poll-in-bdrv_replace_child_noperm.patch [bz#2155112] - kvm-block-Remove-poll-parameter-from-bdrv_parent_drained.patch [bz#2155112] - kvm-accel-introduce-accelerator-blocker-API.patch [bz#1979276] - kvm-KVM-keep-track-of-running-ioctls.patch [bz#1979276] - kvm-kvm-Atomic-memslot-updates.patch [bz#1979276] - Resolves: bz#1905805 (support config interrupt in vhost-vdpa qemu) - Resolves: bz#2159408 ([s390x] VMs with ISM passthrough don't autostart after leapp upgrade from RHEL 8) - Resolves: bz#2124856 (VM with virtio interface and iommu=on will crash when try to migrate) - Resolves: bz#2155112 (Qemu coredump after do snapshot of mirrored top image and its converted base image(iothread enabled)) - Resolves: bz#1979276 (SVM: non atomic memslot updates cause boot failure with seabios and cpu-pm=on)
97 lines
3.4 KiB
Diff
97 lines
3.4 KiB
Diff
From 9a789d104a4a69031ad95d7fad6380ab21e82503 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Fri, 18 Nov 2022 18:41:08 +0100
|
|
Subject: [PATCH 26/31] block: Drop out of coroutine in
|
|
bdrv_do_drained_begin_quiesce()
|
|
|
|
RH-Author: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-MergeRequest: 135: block: Simplify drain to prevent QEMU from crashing during snapshot
|
|
RH-Bugzilla: 2155112
|
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
RH-Commit: [14/16] c9266663b822f703e55b6a07de98ceb56e69e924 (sgarzarella/qemu-kvm-c-9-s)
|
|
|
|
The next patch adds a parent drain to bdrv_attach_child_common(), which
|
|
shouldn't be, but is currently called from coroutines in some cases (e.g.
|
|
.bdrv_co_create implementations generally open new nodes). Therefore,
|
|
the assertion that we're not in a coroutine doesn't hold true any more.
|
|
|
|
We could just remove the assertion because there is nothing in the
|
|
function that should be in conflict with running in a coroutine, but
|
|
just to be on the safe side, we can reverse the caller relationship
|
|
between bdrv_do_drained_begin() and bdrv_do_drained_begin_quiesce() so
|
|
that the latter also just drops out of coroutine context and we can
|
|
still be certain in the future that any drain code doesn't run in
|
|
coroutines.
|
|
|
|
As a nice side effect, the structure of bdrv_do_drained_begin() is now
|
|
symmetrical with bdrv_do_drained_end().
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-Id: <20221118174110.55183-14-kwolf@redhat.com>
|
|
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 05c272ff0cf1b16cc3606f746182dd99b774f553)
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
---
|
|
block/io.c | 25 ++++++++++++-------------
|
|
1 file changed, 12 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/block/io.c b/block/io.c
|
|
index 2e9503df6a..5e9150d92c 100644
|
|
--- a/block/io.c
|
|
+++ b/block/io.c
|
|
@@ -346,10 +346,15 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
|
|
}
|
|
}
|
|
|
|
-void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent)
|
|
+static void bdrv_do_drained_begin(BlockDriverState *bs, BdrvChild *parent,
|
|
+ bool poll)
|
|
{
|
|
IO_OR_GS_CODE();
|
|
- assert(!qemu_in_coroutine());
|
|
+
|
|
+ if (qemu_in_coroutine()) {
|
|
+ bdrv_co_yield_to_drain(bs, true, parent, poll);
|
|
+ return;
|
|
+ }
|
|
|
|
/* Stop things in parent-to-child order */
|
|
if (qatomic_fetch_inc(&bs->quiesce_counter) == 0) {
|
|
@@ -359,17 +364,6 @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent)
|
|
bs->drv->bdrv_drain_begin(bs);
|
|
}
|
|
}
|
|
-}
|
|
-
|
|
-static void bdrv_do_drained_begin(BlockDriverState *bs, BdrvChild *parent,
|
|
- bool poll)
|
|
-{
|
|
- if (qemu_in_coroutine()) {
|
|
- bdrv_co_yield_to_drain(bs, true, parent, poll);
|
|
- return;
|
|
- }
|
|
-
|
|
- bdrv_do_drained_begin_quiesce(bs, parent);
|
|
|
|
/*
|
|
* Wait for drained requests to finish.
|
|
@@ -385,6 +379,11 @@ static void bdrv_do_drained_begin(BlockDriverState *bs, BdrvChild *parent,
|
|
}
|
|
}
|
|
|
|
+void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent)
|
|
+{
|
|
+ bdrv_do_drained_begin(bs, parent, false);
|
|
+}
|
|
+
|
|
void bdrv_drained_begin(BlockDriverState *bs)
|
|
{
|
|
IO_OR_GS_CODE();
|
|
--
|
|
2.31.1
|
|
|