SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Add a wrapper to qemu_bh_schedule

Browse Source 
Wrap qemu_bh_schedule() to ensure we always hold a reference to the
current_migration object.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240119233922.32588-5-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Fabiano Rosas 2024-01-19 20:39:21 -03:00 committed by Peter Xu
parent 9cf268965d
commit 699d9476a0
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
migration/migration.c
View File

@ -199,6 +199,16 @@ void migration_object_init(void)
dirty_bitmap_mig_init(); dirty_bitmap_mig_init();
} }
static void migration_bh_schedule(MigrationState *s, QEMUBH *bh)
{
/*
* Ref the state for bh, because it may be called when
* there're already no other refs
*/
object_ref(OBJECT(s));
qemu_bh_schedule(bh);
}
void migration_cancel(const Error *error) void migration_cancel(const Error *error)
{ {
if (error) { if (error) {
@ -714,8 +724,7 @@ process_incoming_migration_co(void *opaque)
} }
mis->bh = qemu_bh_new(process_incoming_migration_bh, mis); mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
object_ref(OBJECT(migrate_get_current())); migration_bh_schedule(migrate_get_current(), mis->bh);
qemu_bh_schedule(mis->bh);
return; return;
fail: fail:
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
@ -1332,16 +1341,6 @@ static void migrate_fd_cleanup(MigrationState *s)
yank_unregister_instance(MIGRATION_YANK_INSTANCE); yank_unregister_instance(MIGRATION_YANK_INSTANCE);
} }
static void migrate_fd_cleanup_schedule(MigrationState *s)
{
/*
* Ref the state for bh, because it may be called when
* there're already no other refs
*/
object_ref(OBJECT(s));
qemu_bh_schedule(s->cleanup_bh);
}
static void migrate_fd_cleanup_bh(void *opaque) static void migrate_fd_cleanup_bh(void *opaque)
{ {
MigrationState *s = opaque; MigrationState *s = opaque;
@ -3140,7 +3139,7 @@ static void migration_iteration_finish(MigrationState *s)
error_report("%s: Unknown ending state %d", __func__, s->state); error_report("%s: Unknown ending state %d", __func__, s->state);
break; break;
} }
migrate_fd_cleanup_schedule(s); migration_bh_schedule(s, s->cleanup_bh);
bql_unlock(); bql_unlock();
} }
@ -3171,7 +3170,7 @@ static void bg_migration_iteration_finish(MigrationState *s)
break; break;
} }
migrate_fd_cleanup_schedule(s); migration_bh_schedule(s, s->cleanup_bh);
bql_unlock(); bql_unlock();
} }
@ -3487,9 +3486,7 @@ static void *bg_migration_thread(void *opaque)
* writes to virtio VQs memory which is in write-protected region. * writes to virtio VQs memory which is in write-protected region.
*/ */
s->vm_start_bh = qemu_bh_new(bg_migration_vm_start_bh, s); s->vm_start_bh = qemu_bh_new(bg_migration_vm_start_bh, s);
object_ref(OBJECT(s)); migration_bh_schedule(s, s->vm_start_bh);
qemu_bh_schedule(s->vm_start_bh);
bql_unlock(); bql_unlock();
while (migration_is_active(s)) { while (migration_is_active(s)) {