[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/28] migration: protect migration_bitmap
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 27/28] migration: protect migration_bitmap |
Date: |
Tue, 7 Jul 2015 15:09:08 +0200 |
From: Li Zhijian <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 644f52a..9c0bcfe 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -494,6 +494,7 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t
**current_data,
return 1;
}
+/* Called with rcu_read_lock() to protect migration_bitmap */
static inline
ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr,
ram_addr_t start)
@@ -502,26 +503,31 @@ ram_addr_t
migration_bitmap_find_and_reset_dirty(MemoryRegion *mr,
unsigned long nr = base + (start >> TARGET_PAGE_BITS);
uint64_t mr_size = TARGET_PAGE_ALIGN(memory_region_size(mr));
unsigned long size = base + (mr_size >> TARGET_PAGE_BITS);
+ unsigned long *bitmap;
unsigned long next;
+ bitmap = atomic_rcu_read(&migration_bitmap);
if (ram_bulk_stage && nr > base) {
next = nr + 1;
} else {
- next = find_next_bit(migration_bitmap, size, nr);
+ next = find_next_bit(bitmap, size, nr);
}
if (next < size) {
- clear_bit(next, migration_bitmap);
+ clear_bit(next, bitmap);
migration_dirty_pages--;
}
return (next - base) << TARGET_PAGE_BITS;
}
+/* Called with rcu_read_lock() to protect migration_bitmap */
static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length)
{
+ unsigned long *bitmap;
+ bitmap = atomic_rcu_read(&migration_bitmap);
migration_dirty_pages +=
- cpu_physical_memory_sync_dirty_bitmap(migration_bitmap, start, length);
+ cpu_physical_memory_sync_dirty_bitmap(bitmap, start, length);
}
@@ -1017,10 +1023,15 @@ void free_xbzrle_decoded_buf(void)
static void migration_end(void)
{
- if (migration_bitmap) {
+ /* caller have hold iothread lock or is in a bh, so there is
+ * no writing race against this migration_bitmap
+ */
+ unsigned long *bitmap = migration_bitmap;
+ atomic_rcu_set(&migration_bitmap, NULL);
+ if (bitmap) {
memory_global_dirty_log_stop();
- g_free(migration_bitmap);
- migration_bitmap = NULL;
+ synchronize_rcu();
+ g_free(bitmap);
}
XBZRLE_cache_lock();
--
2.4.3
- [Qemu-devel] [PULL 20/28] migration: ensure we start in NONE state, (continued)
- [Qemu-devel] [PULL 20/28] migration: ensure we start in NONE state, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 22/28] migration: No need to call trace_migrate_set_state(), Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 23/28] migration: create migration event, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 21/28] migration: Use always helper to set state, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 24/28] migration: Make events a capability, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 25/28] migration: Add migration events on target side, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 26/28] check_section_footers: Check the correct section_id, Juan Quintela, 2015/07/07
- [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap,
Juan Quintela <=
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Kevin Wolf, 2015/07/08
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Paolo Bonzini, 2015/07/08
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Wen Congyang, 2015/07/08
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Paolo Bonzini, 2015/07/09
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Wen Congyang, 2015/07/09
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Paolo Bonzini, 2015/07/09
- Re: [Qemu-devel] [PULL 27/28] migration: protect migration_bitmap, Wen Congyang, 2015/07/09
[Qemu-devel] [PULL 28/28] migration: extend migration_bitmap, Juan Quintela, 2015/07/07
Re: [Qemu-devel] [PULL v3 00/28] Migration pull request, Peter Maydell, 2015/07/07