[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/21] migration: always initial RAMBlock.bmap to 1 f
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 21/21] migration: always initial RAMBlock.bmap to 1 for new migration |
Date: |
Mon, 15 Jul 2019 15:51:25 +0200 |
From: Ivan Ren <address@hidden>
Reproduce the problem:
migrate
migrate_cancel
migrate
Error happen for memory migration
The reason as follows:
1. qemu start, ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION] all set to
1 by a series of cpu_physical_memory_set_dirty_range
2. migration start:ram_init_bitmaps
- memory_global_dirty_log_start: begin log diry
- memory_global_dirty_log_sync: sync dirty bitmap to
ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION]
- migration_bitmap_sync_range: sync ram_list.
dirty_memory[DIRTY_MEMORY_MIGRATION] to RAMBlock.bmap
and ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION] is set to zero
3. migration data...
4. migrate_cancel, will stop log dirty
5. migration start:ram_init_bitmaps
- memory_global_dirty_log_start: begin log diry
- memory_global_dirty_log_sync: sync dirty bitmap to
ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION]
- migration_bitmap_sync_range: sync ram_list.
dirty_memory[DIRTY_MEMORY_MIGRATION] to RAMBlock.bmap
and ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION] is set to zero
Here RAMBlock.bmap only have new logged dirty pages, don't contain
the whole guest pages.
Signed-off-by: Ivan Ren <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 85bc36101c..2b0774c2bf 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3213,11 +3213,11 @@ static int ram_state_init(RAMState **rsp)
QSIMPLEQ_INIT(&(*rsp)->src_page_requests);
/*
+ * Count the total number of pages used by ram blocks not including any
+ * gaps due to alignment or unplugs.
* This must match with the initial values of dirty bitmap.
- * Currently we initialize the dirty bitmap to all zeros so
- * here the total dirty page count is zero.
*/
- (*rsp)->migration_dirty_pages = 0;
+ (*rsp)->migration_dirty_pages = ram_bytes_total() >> TARGET_PAGE_BITS;
ram_state_reset(*rsp);
return 0;
@@ -3249,12 +3249,13 @@ static void ram_list_init_bitmaps(void)
* The initial dirty bitmap for migration must be set with all
* ones to make sure we'll migrate every guest RAM page to
* destination.
- * Here we didn't set RAMBlock.bmap simply because it is already
- * set in ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION] in
- * ram_block_add, and that's where we'll sync the dirty bitmaps.
- * Here setting RAMBlock.bmap would be fine too but not necessary.
+ * Here we set RAMBlock.bmap all to 1 because when rebegin a
+ * new migration after a failed migration, ram_list.
+ * dirty_memory[DIRTY_MEMORY_MIGRATION] don't include the whole
+ * guest memory.
*/
block->bmap = bitmap_new(pages);
+ bitmap_set(block->bmap, 0, pages);
block->clear_bmap_shift = shift;
block->clear_bmap = bitmap_new(clear_bmap_size(pages, shift));
if (migrate_postcopy_ram()) {
--
2.21.0
- [Qemu-devel] [PULL 11/21] memory: Pass mr into snapshot_and_clear_dirty, (continued)
- [Qemu-devel] [PULL 11/21] memory: Pass mr into snapshot_and_clear_dirty, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 12/21] memory: Introduce memory listener hook log_clear(), Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 13/21] kvm: Update comments for sync_dirty_bitmap, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 14/21] kvm: Persistent per kvmslot dirty bitmap, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 15/21] kvm: Introduce slots lock for memory listener, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 16/21] kvm: Support KVM_CLEAR_DIRTY_LOG, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 17/21] migration: Split log_clear() into smaller chunks, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 18/21] migration: allow private destination ram with x-ignore-shared, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 19/21] migration/postcopy: fix document of postcopy_send_discard_bm_ram(), Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 20/21] migration/postcopy: remove redundant cpu_synchronize_all_post_init, Juan Quintela, 2019/07/15
- [Qemu-devel] [PULL 21/21] migration: always initial RAMBlock.bmap to 1 for new migration,
Juan Quintela <=
- Re: [Qemu-devel] [PULL 00/21] Migration pull request, Peter Maydell, 2019/07/15