Skip to content

Commit

Permalink
migration: Add a wrapper to qemu_bh_schedule
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabiano Rosas authored and xzpeter committed Jan 26, 2024
1 parent b561ebb commit 22f2bef
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions migration/migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@ void migration_object_init(void)
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)
{
if (error) {
Expand Down Expand Up @@ -714,8 +724,7 @@ process_incoming_migration_co(void *opaque)
}

mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
object_ref(OBJECT(migrate_get_current()));
qemu_bh_schedule(mis->bh);
migration_bh_schedule(migrate_get_current(), mis->bh);
return;
fail:
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
Expand Down Expand Up @@ -1332,16 +1341,6 @@ static void migrate_fd_cleanup(MigrationState *s)
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)
{
MigrationState *s = opaque;
Expand Down Expand Up @@ -3140,7 +3139,7 @@ static void migration_iteration_finish(MigrationState *s)
error_report("%s: Unknown ending state %d", __func__, s->state);
break;
}
migrate_fd_cleanup_schedule(s);
migration_bh_schedule(s, s->cleanup_bh);
bql_unlock();
}

Expand Down Expand Up @@ -3171,7 +3170,7 @@ static void bg_migration_iteration_finish(MigrationState *s)
break;
}

migrate_fd_cleanup_schedule(s);
migration_bh_schedule(s, s->cleanup_bh);
bql_unlock();
}

Expand Down Expand Up @@ -3487,9 +3486,7 @@ static void *bg_migration_thread(void *opaque)
* writes to virtio VQs memory which is in write-protected region.
*/
s->vm_start_bh = qemu_bh_new(bg_migration_vm_start_bh, s);
object_ref(OBJECT(s));
qemu_bh_schedule(s->vm_start_bh);

migration_bh_schedule(s, s->vm_start_bh);
bql_unlock();

while (migration_is_active(s)) {
Expand Down

0 comments on commit 22f2bef

Please sign in to comment.