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)
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 1808e560396872173f787f8e338e9837a4c3d626 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Fri, 18 Nov 2022 18:41:00 +0100
|
|
Subject: [PATCH 18/31] block: Inline bdrv_drain_invoke()
|
|
|
|
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: [6/16] 2c7473a36360eb43d94b967deb12308cb5ea0d3b (sgarzarella/qemu-kvm-c-9-s)
|
|
|
|
bdrv_drain_invoke() has now two entirely separate cases that share no
|
|
code any more and are selected depending on a bool parameter. Each case
|
|
has only one caller. Just inline the function.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20221118174110.55183-6-kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit c7bc05f78ab31fb02fc9635f60b9bd22efc8d121)
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
---
|
|
block/io.c | 23 ++++++-----------------
|
|
1 file changed, 6 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/block/io.c b/block/io.c
|
|
index f4ca62b034..a25103be6f 100644
|
|
--- a/block/io.c
|
|
+++ b/block/io.c
|
|
@@ -242,21 +242,6 @@ typedef struct {
|
|
bool ignore_bds_parents;
|
|
} BdrvCoDrainData;
|
|
|
|
-/* Recursively call BlockDriver.bdrv_drain_begin/end callbacks */
|
|
-static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)
|
|
-{
|
|
- if (!bs->drv || (begin && !bs->drv->bdrv_drain_begin) ||
|
|
- (!begin && !bs->drv->bdrv_drain_end)) {
|
|
- return;
|
|
- }
|
|
-
|
|
- if (begin) {
|
|
- bs->drv->bdrv_drain_begin(bs);
|
|
- } else {
|
|
- bs->drv->bdrv_drain_end(bs);
|
|
- }
|
|
-}
|
|
-
|
|
/* Returns true if BDRV_POLL_WHILE() should go into a blocking aio_poll() */
|
|
bool bdrv_drain_poll(BlockDriverState *bs, bool recursive,
|
|
BdrvChild *ignore_parent, bool ignore_bds_parents)
|
|
@@ -390,7 +375,9 @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs,
|
|
}
|
|
|
|
bdrv_parent_drained_begin(bs, parent, ignore_bds_parents);
|
|
- bdrv_drain_invoke(bs, true);
|
|
+ if (bs->drv && bs->drv->bdrv_drain_begin) {
|
|
+ bs->drv->bdrv_drain_begin(bs);
|
|
+ }
|
|
}
|
|
|
|
static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
|
|
@@ -461,7 +448,9 @@ static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
|
|
assert(bs->quiesce_counter > 0);
|
|
|
|
/* Re-enable things in child-to-parent order */
|
|
- bdrv_drain_invoke(bs, false);
|
|
+ if (bs->drv && bs->drv->bdrv_drain_end) {
|
|
+ bs->drv->bdrv_drain_end(bs);
|
|
+ }
|
|
bdrv_parent_drained_end(bs, parent, ignore_bds_parents);
|
|
|
|
old_quiesce_counter = qatomic_fetch_dec(&bs->quiesce_counter);
|
|
--
|
|
2.31.1
|
|
|