If target is turned of prior to postcopy finished, we crash because busy bitmaps are found at shutdown.
Let's fix it by removing all unfinished bitmaps on shutdown. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- migration/migration.h | 1 + migration/block-dirty-bitmap.c | 44 ++++++++++++++++++++++++++++++---- migration/migration.c | 7 ++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/migration/migration.h b/migration/migration.h index aa9ff6f27b..a3927b93bb 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -331,6 +331,7 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis, void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value); void dirty_bitmap_mig_before_vm_start(void); +void dirty_bitmap_mig_cancel_incoming(void); void init_dirty_bitmap_incoming_migration(void); void migrate_add_address(SocketAddress *address); diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index f96458113c..5a98543672 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -143,6 +143,7 @@ typedef struct DirtyBitmapLoadState { bool bitmaps_enabled; /* set in dirty_bitmap_mig_before_vm_start */ bool stream_ended; /* set when all migrated data handled */ + bool cancelled; GSList *bitmaps; QemuMutex lock; /* protect bitmaps */ @@ -533,8 +534,6 @@ static void dirty_bitmap_load_complete(QEMUFile *f) trace_dirty_bitmap_load_complete(); bdrv_dirty_bitmap_deserialize_finish(s->bitmap); - qemu_mutex_lock(&dbm_load_state.lock); - if (bdrv_dirty_bitmap_has_successor(s->bitmap)) { bdrv_reclaim_dirty_bitmap(s->bitmap, &error_abort); } @@ -547,8 +546,6 @@ static void dirty_bitmap_load_complete(QEMUFile *f) break; } } - - qemu_mutex_unlock(&dbm_load_state.lock); } static int dirty_bitmap_load_bits(QEMUFile *f) @@ -656,6 +653,13 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id) } do { + qemu_mutex_lock(&dbm_load_state.lock); + + if (dbm_load_state.cancelled) { + qemu_mutex_unlock(&dbm_load_state.lock); + break; + } + ret = dirty_bitmap_load_header(f); if (ret < 0) { return ret; @@ -676,6 +680,8 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id) if (ret) { return ret; } + + qemu_mutex_unlock(&dbm_load_state.lock); } while (!(dbm_load_state.flags & DIRTY_BITMAP_MIG_FLAG_EOS)); qemu_mutex_lock(&dbm_load_state.lock); @@ -692,6 +698,36 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id) return 0; } +void dirty_bitmap_mig_cancel_incoming(void) +{ + GSList *item; + + qemu_mutex_lock(&dbm_load_state.lock); + + if (dbm_load_state.bitmaps_enabled && dbm_load_state.stream_ended) { + qemu_mutex_unlock(&dbm_load_state.lock); + return; + } + + dbm_load_state.cancelled = true; + + for (item = dbm_load_state.bitmaps; item; item = g_slist_next(item)) { + DirtyBitmapLoadBitmapState *b = item->data; + + if (!dbm_load_state.bitmaps_enabled || !b->migrated) { + if (bdrv_dirty_bitmap_has_successor(b->bitmap)) { + bdrv_reclaim_dirty_bitmap(b->bitmap, &error_abort); + } + bdrv_release_dirty_bitmap(b->bitmap); + } + } + + g_slist_free_full(dbm_load_state.bitmaps, g_free); + dbm_load_state.bitmaps = NULL; + + qemu_mutex_unlock(&dbm_load_state.lock); +} + static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque) { DirtyBitmapMigBitmapState *dbms = NULL; diff --git a/migration/migration.c b/migration/migration.c index 990bff00c0..12d161165d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -182,6 +182,13 @@ void migration_shutdown(void) */ migrate_fd_cancel(current_migration); object_unref(OBJECT(current_migration)); + + /* + * Cancel incoming migration of dirty bitmaps. Dirty bitmaps + * are non-critical data, and their loss never considered as + * something serious. + */ + dirty_bitmap_mig_cancel_incoming(); } /* For outgoing */ -- 2.21.0