update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Fiona Ebner <f.ebner@proxmox.com>
|
|
|
|
|
Date: Fri, 5 May 2023 15:30:16 +0200
|
|
|
|
|
Subject: [PATCH] savevm-async: don't hold BQL during setup
|
|
|
|
|
|
|
|
|
|
See commit "migration: for snapshots, hold the BQL during setup
|
|
|
|
|
callbacks" for why. This is separate, because a version of that one
|
|
|
|
|
will hopefully land upstream.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
|
|
|
---
|
|
|
|
|
migration/savevm-async.c | 2 --
|
|
|
|
|
1 file changed, 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
2023-05-24 16:56:53 +03:00
|
|
|
index ea3b2f36a6..dd7744ab66 100644
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
--- a/migration/savevm-async.c
|
|
|
|
|
+++ b/migration/savevm-async.c
|
|
|
|
|
@@ -403,10 +403,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)
|
|
|
|
|
snap_state.state = SAVE_STATE_ACTIVE;
|
|
|
|
|
snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
|
|
|
|
|
snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
|
|
|
|
|
- qemu_mutex_unlock_iothread();
|
|
|
|
|
qemu_savevm_state_header(snap_state.file);
|
|
|
|
|
qemu_savevm_state_setup(snap_state.file);
|
|
|
|
|
- qemu_mutex_lock_iothread();
|
|
|
|
|
|
|
|
|
|
/* Async processing from here on out happens in iohandler context, so let
|
|
|
|
|
* the target bdrv have its home there.
|