[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/19] migration: Take bitmap mutex when completing ram migration
From: |
Juan Quintela |
Subject: |
[PATCH 05/19] migration: Take bitmap mutex when completing ram migration |
Date: |
Mon, 21 Nov 2022 14:27:03 +0100 |
From: Peter Xu <peterx@redhat.com>
Any call to ram_find_and_save_block() needs to take the bitmap mutex. We
used to not take it for most of ram_save_complete() because we thought
we're the only one left using the bitmap, but it's not true after the
preempt full patchset applied, since the return path can be taking it too.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index 8aad17c429..cc72c24c18 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3406,6 +3406,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
/* try transferring iterative blocks of memory */
/* flush all remaining blocks regardless of rate limiting */
+ qemu_mutex_lock(&rs->bitmap_mutex);
while (true) {
int pages;
@@ -3419,6 +3420,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
break;
}
}
+ qemu_mutex_unlock(&rs->bitmap_mutex);
flush_compressed_data(rs);
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
--
2.38.1
- [PATCH 00/19] Migration patches for 8.8, Juan Quintela, 2022/11/21
- [PATCH 18/19] migration: Remove old preempt code around state maintainance, Juan Quintela, 2022/11/21
- [PATCH 09/19] migration: Remove RAMState.f references in compression code, Juan Quintela, 2022/11/21
- [PATCH 03/19] migration: Export ram_transferred_ram(), Juan Quintela, 2022/11/21
- [PATCH 02/19] multifd: Create page_count fields into both MultiFD{Recv, Send}Params, Juan Quintela, 2022/11/21
- [PATCH 08/19] migration: Trivial cleanup save_page_header() on same block check, Juan Quintela, 2022/11/21
- [PATCH 05/19] migration: Take bitmap mutex when completing ram migration,
Juan Quintela <=
- [PATCH 16/19] migration: Move last_sent_block into PageSearchStatus, Juan Quintela, 2022/11/21
- [PATCH 06/19] migration: Add postcopy_preempt_active(), Juan Quintela, 2022/11/21
- [PATCH 17/19] migration: Send requested page directly in rp-return thread, Juan Quintela, 2022/11/21
- [PATCH 01/19] multifd: Create page_size fields into both MultiFD{Recv, Send}Params, Juan Quintela, 2022/11/21
- [PATCH 14/19] migration: Add pss_init(), Juan Quintela, 2022/11/21
- [PATCH 07/19] migration: Cleanup xbzrle zero page cache update logic, Juan Quintela, 2022/11/21
- [PATCH 15/19] migration: Make PageSearchStatus part of RAMState, Juan Quintela, 2022/11/21
- [PATCH 10/19] migration: Yield bitmap_mutex properly when sending/sleeping, Juan Quintela, 2022/11/21
- [PATCH 12/19] migration: Teach PSS about host page, Juan Quintela, 2022/11/21
- [PATCH 11/19] migration: Use atomic ops properly for page accountings, Juan Quintela, 2022/11/21