motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 05:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: stop tracking ram writes when cancelling background migration

Browse source 
Currently, it is only done when the iteration finishes successfully.
Not cleaning up the userfaultfd write protection can lead to
symptoms/issues such as the process hanging in memmove or GDB not
being able to attach.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-Id: <20230526115908.196171-1-f.ebner@proxmox.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Fiona Ebner 2023-05-26 13:59:08 +02:00 • committed by Juan Quintela
parent a4c6275aa1
commit 3a8b81f2e6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
migration/migration.c
View file

@ -2400,13 +2400,6 @@ static void bg_migration_completion(MigrationState *s)
{ {
int current_active_state = s->state; int current_active_state = s->state;
/*
* Stop tracking RAM writes - un-protect memory, un-register UFFD
* memory ranges, flush kernel wait queues and wake up threads
* waiting for write fault to be resolved.
*/
ram_write_tracking_stop();
if (s->state == MIGRATION_STATUS_ACTIVE) { if (s->state == MIGRATION_STATUS_ACTIVE) {
/* /*
* By this moment we have RAM content saved into the migration stream. * By this moment we have RAM content saved into the migration stream.
@ -2788,6 +2781,13 @@ static void migration_iteration_finish(MigrationState *s)
static void bg_migration_iteration_finish(MigrationState *s) static void bg_migration_iteration_finish(MigrationState *s)
{ {
/*
* Stop tracking RAM writes - un-protect memory, un-register UFFD
* memory ranges, flush kernel wait queues and wake up threads
* waiting for write fault to be resolved.
*/
ram_write_tracking_stop();
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
switch (s->state) { switch (s->state) {
case MIGRATION_STATUS_COMPLETED: case MIGRATION_STATUS_COMPLETED: