Skip to content

Commit 2cc637f

Browse files
zhijianli88xzpeter
authored andcommitted
migration/colo: Fix bdrv_graph_rdlock_main_loop: Assertion `!qemu_in_coroutine()' failed.
bdrv_activate_all() should not be called from the coroutine context, move it to the QEMU thread colo_process_incoming_thread() with the bql_lock protected. The backtrace is as follows: #4 0x0000561af7948362 in bdrv_graph_rdlock_main_loop () at ../block/graph-lock.c:260 #5 0x0000561af7907a68 in graph_lockable_auto_lock_mainloop (x=0x7fd29810be7b) at /patch/to/qemu/include/block/graph-lock.h:259 #6 0x0000561af79167d1 in bdrv_activate_all (errp=0x7fd29810bed0) at ../block.c:6906 #7 0x0000561af762b4af in colo_incoming_co () at ../migration/colo.c:935 #8 0x0000561af7607e57 in process_incoming_migration_co (opaque=0x0) at ../migration/migration.c:793 #9 0x0000561af7adbeeb in coroutine_trampoline (i0=-106876144, i1=22042) at ../util/coroutine-ucontext.c:175 #10 0x00007fd2a5cf21c0 in () at /lib64/libc.so.6 Cc: [email protected] Cc: Fabiano Rosas <[email protected]> Closes: https://gitlab.com/qemu-project/qemu/-/issues/2277 Fixes: 2b3912f ("block: Mark bdrv_first_blk() and bdrv_is_root_node() GRAPH_RDLOCK") Signed-off-by: Li Zhijian <[email protected]> Reviewed-by: Zhang Chen <[email protected]> Tested-by: Zhang Chen <[email protected]> Reviewed-by: Fabiano Rosas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Peter Xu <[email protected]>
1 parent 5ef7e26 commit 2cc637f

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

migration/colo.c

+10-8
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,16 @@ static void *colo_process_incoming_thread(void *opaque)
835835
return NULL;
836836
}
837837

838+
/* Make sure all file formats throw away their mutable metadata */
839+
bql_lock();
840+
bdrv_activate_all(&local_err);
841+
if (local_err) {
842+
bql_unlock();
843+
error_report_err(local_err);
844+
return NULL;
845+
}
846+
bql_unlock();
847+
838848
failover_init_state();
839849

840850
mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);
@@ -922,7 +932,6 @@ static void *colo_process_incoming_thread(void *opaque)
922932
int coroutine_fn colo_incoming_co(void)
923933
{
924934
MigrationIncomingState *mis = migration_incoming_get_current();
925-
Error *local_err = NULL;
926935
QemuThread th;
927936

928937
assert(bql_locked());
@@ -931,13 +940,6 @@ int coroutine_fn colo_incoming_co(void)
931940
return 0;
932941
}
933942

934-
/* Make sure all file formats throw away their mutable metadata */
935-
bdrv_activate_all(&local_err);
936-
if (local_err) {
937-
error_report_err(local_err);
938-
return -EINVAL;
939-
}
940-
941943
qemu_thread_create(&th, "COLO incoming", colo_process_incoming_thread,
942944
mis, QEMU_THREAD_JOINABLE);
943945

0 commit comments

Comments
 (0)