migration: Inhibit virtio-balloon for the duration of background snapshot
The same thing as for incoming postcopy - we cannot deal with concurrent
RAM discards when using background snapshot feature in outgoing migration.
Fixes: 8518278a6a
(migration: implementation
of background snapshot thread)
Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
Reported-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210401092226.102804-3-andrey.gruzdev@virtuozzo.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
ecb23efea0
commit
1a8e44a89f
@ -66,8 +66,12 @@ static bool virtio_balloon_pbp_matches(PartiallyBalloonedPage *pbp,
|
|||||||
|
|
||||||
static bool virtio_balloon_inhibited(void)
|
static bool virtio_balloon_inhibited(void)
|
||||||
{
|
{
|
||||||
/* Postcopy cannot deal with concurrent discards, so it's special. */
|
/*
|
||||||
return ram_block_discard_is_disabled() || migration_in_incoming_postcopy();
|
* Postcopy cannot deal with concurrent discards,
|
||||||
|
* so it's special, as well as background snapshots.
|
||||||
|
*/
|
||||||
|
return ram_block_discard_is_disabled() || migration_in_incoming_postcopy() ||
|
||||||
|
migration_in_bg_snapshot();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void balloon_inflate_page(VirtIOBalloon *balloon,
|
static void balloon_inflate_page(VirtIOBalloon *balloon,
|
||||||
|
@ -70,6 +70,8 @@ bool migration_in_postcopy_after_devices(MigrationState *);
|
|||||||
void migration_global_dump(Monitor *mon);
|
void migration_global_dump(Monitor *mon);
|
||||||
/* True if incomming migration entered POSTCOPY_INCOMING_DISCARD */
|
/* True if incomming migration entered POSTCOPY_INCOMING_DISCARD */
|
||||||
bool migration_in_incoming_postcopy(void);
|
bool migration_in_incoming_postcopy(void);
|
||||||
|
/* True if background snapshot is active */
|
||||||
|
bool migration_in_bg_snapshot(void);
|
||||||
|
|
||||||
/* migration/block-dirty-bitmap.c */
|
/* migration/block-dirty-bitmap.c */
|
||||||
void dirty_bitmap_mig_init(void);
|
void dirty_bitmap_mig_init(void);
|
||||||
|
@ -1976,6 +1976,14 @@ bool migration_in_incoming_postcopy(void)
|
|||||||
return ps >= POSTCOPY_INCOMING_DISCARD && ps < POSTCOPY_INCOMING_END;
|
return ps >= POSTCOPY_INCOMING_DISCARD && ps < POSTCOPY_INCOMING_END;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool migration_in_bg_snapshot(void)
|
||||||
|
{
|
||||||
|
MigrationState *s = migrate_get_current();
|
||||||
|
|
||||||
|
return migrate_background_snapshot() &&
|
||||||
|
migration_is_setup_or_active(s->state);
|
||||||
|
}
|
||||||
|
|
||||||
bool migration_is_idle(void)
|
bool migration_is_idle(void)
|
||||||
{
|
{
|
||||||
MigrationState *s = current_migration;
|
MigrationState *s = current_migration;
|
||||||
|
Loading…
Reference in New Issue
Block a user