ebd0a23ab5
- kvm-migration-multifd-move-macros-to-multifd-header.patch [RHEL-59697] - kvm-migration-refactor-channel-discovery-mechanism.patch [RHEL-59697] - kvm-migration-Add-save_postcopy_prepare-savevm-handler.patch [RHEL-59697] - kvm-migration-ram-Implement-save_postcopy_prepare.patch [RHEL-59697] - kvm-tests-qtest-migration-consolidate-set-capabilities.patch [RHEL-59697] - kvm-migration-write-zero-pages-when-postcopy-enabled.patch [RHEL-59697] - kvm-migration-enable-multifd-and-postcopy-together.patch [RHEL-59697] - kvm-migration-Add-qtest-for-migration-over-RDMA.patch [RHEL-59697] - kvm-qtest-migration-rdma-Enforce-RLIMIT_MEMLOCK-128MB-re.patch [RHEL-59697] - kvm-qtest-migration-rdma-Add-test-for-rdma-migration-wit.patch [RHEL-59697] - kvm-tests-qtest-migration-add-postcopy-tests-with-multif.patch [RHEL-59697] - kvm-file-posix-Fix-aio-threads-performance-regression-af.patch [RHEL-96854] - kvm-block-remove-outdated-comments-about-AioContext-lock.patch [RHEL-88561] - kvm-block-move-drain-outside-of-read-locked-bdrv_reopen_.patch [RHEL-88561] - kvm-block-snapshot-move-drain-outside-of-read-locked-bdr.patch [RHEL-88561] - kvm-block-move-drain-outside-of-read-locked-bdrv_inactiv.patch [RHEL-88561] - kvm-block-mark-bdrv_parent_change_aio_context-GRAPH_RDLO.patch [RHEL-88561] - kvm-block-mark-change_aio_ctx-callback-and-instances-as-.patch [RHEL-88561] - kvm-block-mark-bdrv_child_change_aio_context-GRAPH_RDLOC.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_change_aio_context-.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_try_change_aio_cont.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_attach_child_common.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_set_backing_hd_drai.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_root_attach_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_attach_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-quorum_add_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-bdrv_root_unref_child.patch [RHEL-88561] - kvm-block-move-drain-outside-of-quorum_del_child.patch [RHEL-88561] - kvm-blockdev-drain-while-unlocked-in-internal_snapshot_a.patch [RHEL-88561] - kvm-blockdev-drain-while-unlocked-in-external_snapshot_a.patch [RHEL-88561] - kvm-block-mark-bdrv_drained_begin-and-friends-as-GRAPH_U.patch [RHEL-88561] - kvm-iotests-graph-changes-while-io-remove-image-file-aft.patch [RHEL-88561] - kvm-iotests-graph-changes-while-io-add-test-case-with-re.patch [RHEL-88561] - Resolves: RHEL-59697 (Allow multifd+postcopy features being enabled together, but only use multifd during precopy ) - Resolves: RHEL-96854 (Performance Degradation(aio=threads) between Upstream Commit b75c5f9 and 984a32f) - Resolves: RHEL-88561 (qemu graph deadlock during job-dismiss)
86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
From de70d5b485006ecd92e860242634a3166b709fa8 Mon Sep 17 00:00:00 2001
|
|
From: Fiona Ebner <f.ebner@proxmox.com>
|
|
Date: Fri, 30 May 2025 17:10:53 +0200
|
|
Subject: [PATCH 28/33] block: move drain outside of quorum_del_child()
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 393: block: do not drain while holding the graph lock
|
|
RH-Jira: RHEL-88561
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
|
|
RH-Commit: [16/21] abceebd102dde266fa880f2c40ef83de25a87ed6 (kmwolf/centos-qemu-kvm)
|
|
|
|
The quorum_del_child() callback runs under the graph lock, so it is
|
|
not allowed to drain. It is only called as the .bdrv_del_child()
|
|
callback, which is only called in the bdrv_del_child() function, which
|
|
also runs under the graph lock.
|
|
|
|
The bdrv_del_child() function is called by qmp_x_blockdev_change().
|
|
A drained section was already introduced there by commit "block: move
|
|
drain out of quorum_add_child()".
|
|
|
|
This finally finishes moving out the drain to places that are not
|
|
under the graph lock started in "block: move draining out of
|
|
bdrv_change_aio_context() and mark GRAPH_RDLOCK".
|
|
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Message-ID: <20250530151125.955508-17-f.ebner@proxmox.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit d75f8ed1d7fc27cf1643e549cd006a68d3bf6ef1)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
block.c | 2 ++
|
|
block/quorum.c | 2 --
|
|
include/block/block_int-common.h | 7 +++++++
|
|
3 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block.c b/block.c
|
|
index 51bc084b1e..309ef1349a 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -8276,6 +8276,8 @@ void bdrv_add_child(BlockDriverState *parent_bs, BlockDriverState *child_bs,
|
|
/*
|
|
* Hot remove a BDS's child. Used in combination with bdrv_add_child, so the
|
|
* user can take a child offline when it is broken and take a new child online.
|
|
+ *
|
|
+ * All block nodes must be drained.
|
|
*/
|
|
void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp)
|
|
{
|
|
diff --git a/block/quorum.c b/block/quorum.c
|
|
index 81407a38ee..cc3bc5f4e7 100644
|
|
--- a/block/quorum.c
|
|
+++ b/block/quorum.c
|
|
@@ -1147,9 +1147,7 @@ quorum_del_child(BlockDriverState *bs, BdrvChild *child, Error **errp)
|
|
(s->num_children - i - 1) * sizeof(BdrvChild *));
|
|
s->children = g_renew(BdrvChild *, s->children, --s->num_children);
|
|
|
|
- bdrv_drain_all_begin();
|
|
bdrv_unref_child(bs, child);
|
|
- bdrv_drain_all_end();
|
|
|
|
quorum_refresh_flags(bs);
|
|
}
|
|
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
|
|
index 8d76b37c03..f33695ab74 100644
|
|
--- a/include/block/block_int-common.h
|
|
+++ b/include/block/block_int-common.h
|
|
@@ -406,6 +406,13 @@ struct BlockDriver {
|
|
void GRAPH_WRLOCK_PTR (*bdrv_add_child)(
|
|
BlockDriverState *parent, BlockDriverState *child, Error **errp);
|
|
|
|
+ /**
|
|
+ * Hot remove a BDS's child. Used in combination with bdrv_add_child, so the
|
|
+ * user can take a child offline when it is broken and take a new child
|
|
+ * online.
|
|
+ *
|
|
+ * All block nodes must be drained.
|
|
+ */
|
|
void GRAPH_WRLOCK_PTR (*bdrv_del_child)(
|
|
BlockDriverState *parent, BdrvChild *child, Error **errp);
|
|
|
|
--
|
|
2.39.3
|
|
|