[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/40] migration: setup ramstate for resume
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 29/40] migration: setup ramstate for resume |
Date: |
Wed, 16 May 2018 01:40:06 +0200 |
From: Peter Xu <address@hidden>
After we updated the dirty bitmaps of ramblocks, we also need to update
the critical fields in RAMState to make sure it is ready for a resume.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 45 +++++++++++++++++++++++++++++++++++++++++-
migration/trace-events | 1 +
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index b16eabcfb9..5bcbf7a9f9 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2491,6 +2491,41 @@ static int ram_init_all(RAMState **rsp)
return 0;
}
+static void ram_state_resume_prepare(RAMState *rs, QEMUFile *out)
+{
+ RAMBlock *block;
+ uint64_t pages = 0;
+
+ /*
+ * Postcopy is not using xbzrle/compression, so no need for that.
+ * Also, since source are already halted, we don't need to care
+ * about dirty page logging as well.
+ */
+
+ RAMBLOCK_FOREACH(block) {
+ pages += bitmap_count_one(block->bmap,
+ block->used_length >> TARGET_PAGE_BITS);
+ }
+
+ /* This may not be aligned with current bitmaps. Recalculate. */
+ rs->migration_dirty_pages = pages;
+
+ rs->last_seen_block = NULL;
+ rs->last_sent_block = NULL;
+ rs->last_page = 0;
+ rs->last_version = ram_list.version;
+ /*
+ * Disable the bulk stage, otherwise we'll resend the whole RAM no
+ * matter what we have sent.
+ */
+ rs->ram_bulk_stage = false;
+
+ /* Update RAMState cache of output QEMUFile */
+ rs->f = out;
+
+ trace_ram_state_resume_prepare(pages);
+}
+
/*
* Each of ram_save_setup, ram_save_iterate and ram_save_complete has
* long-running RCU critical section. When rcu-reclaims in the code
@@ -3486,8 +3521,16 @@ out:
static int ram_resume_prepare(MigrationState *s, void *opaque)
{
RAMState *rs = *(RAMState **)opaque;
+ int ret;
- return ram_dirty_bitmap_sync_all(s, rs);
+ ret = ram_dirty_bitmap_sync_all(s, rs);
+ if (ret) {
+ return ret;
+ }
+
+ ram_state_resume_prepare(rs, s->to_dst_file);
+
+ return 0;
}
static SaveVMHandlers savevm_ram_handlers = {
diff --git a/migration/trace-events b/migration/trace-events
index 53243e17ec..3c798ddd11 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -88,6 +88,7 @@ ram_dirty_bitmap_reload_complete(char *str) "%s"
ram_dirty_bitmap_sync_start(void) ""
ram_dirty_bitmap_sync_wait(void) ""
ram_dirty_bitmap_sync_complete(void) ""
+ram_state_resume_prepare(uint64_t v) "%" PRId64
# migration/migration.c
await_return_path_close_on_source_close(void) ""
--
2.17.0
- [Qemu-devel] [PULL 22/40] migration: wakeup dst ram-load-thread for recover, (continued)
- [Qemu-devel] [PULL 22/40] migration: wakeup dst ram-load-thread for recover, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 23/40] migration: new cmd MIG_CMD_RECV_BITMAP, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 21/40] migration: new state "postcopy-recover", Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 25/40] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 24/40] migration: new message MIG_RP_MSG_RECV_BITMAP, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 26/40] migration: new message MIG_RP_MSG_RESUME_ACK, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 27/40] migration: introduce SaveVMHandlers.resume_prepare, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 30/40] migration: final handshake for the resume, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 31/40] migration: init dst in migration_object_init too, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 28/40] migration: synchronize dirty bitmap for resume, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 29/40] migration: setup ramstate for resume,
Juan Quintela <=
- [Qemu-devel] [PULL 32/40] qmp/migration: new command migrate-recover, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 33/40] hmp/migration: add migrate_recover command, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 34/40] migration: introduce lock for to_dst_file, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 35/40] migration/qmp: add command migrate-pause, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 36/40] migration/hmp: add migrate_pause command, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 38/40] migration: update index field when delete or qsort RDMALocalBlock, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 39/40] migration: Textual fixups for blocktime, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 37/40] migration: update docs, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 40/40] Migration+TLS: Fix crash due to double cleanup, Juan Quintela, 2018/05/15
- Re: [Qemu-devel] [PULL 00/40] Migration PULL requset (take 2), Peter Maydell, 2018/05/17