From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK8i-0003BF-2J for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhK8e-0000w7-Sr for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:32 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:42144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhK8e-0000vj-Lg for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:35:28 -0400 Received: by mail-pg1-x544.google.com with SMTP id y4-v6so10650374pgp.9 for ; Sun, 22 Jul 2018 12:35:28 -0700 (PDT) From: Zhang Chen Date: Mon, 23 Jul 2018 03:33:44 +0800 Message-Id: <20180722193350.6028-15-zhangckid@gmail.com> In-Reply-To: <20180722193350.6028-1-zhangckid@gmail.com> References: <20180722193350.6028-1-zhangckid@gmail.com> Subject: [Qemu-devel] [PATCH V10 14/20] COLO: flush host dirty ram from cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Cc: Zhang Chen , zhanghailiang , Li Zhijian From: zhanghailiang Don't need to flush all VM's ram from cache, only flush the dirty pages since last checkpoint Signed-off-by: Li Zhijian Signed-off-by: Zhang Chen Signed-off-by: zhanghailiang Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 4df85d69c1..32bc141a2e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3581,6 +3581,7 @@ int colo_init_ram_cache(void) } ram_state = g_new0(RAMState, 1); ram_state->migration_dirty_pages = 0; + memory_global_dirty_log_start(); return 0; @@ -3601,10 +3602,12 @@ void colo_release_ram_cache(void) { RAMBlock *block; + memory_global_dirty_log_stop(); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { g_free(block->bmap); block->bmap = NULL; } + rcu_read_lock(); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { if (block->colo_cache) { @@ -3841,6 +3844,13 @@ static void colo_flush_ram_cache(void) void *src_host; unsigned long offset = 0; + memory_global_dirty_log_sync(); + rcu_read_lock(); + RAMBLOCK_FOREACH_MIGRATABLE(block) { + migration_bitmap_sync_range(ram_state, block, 0, block->used_length); + } + rcu_read_unlock(); + trace_colo_flush_ram_cache_begin(ram_state->migration_dirty_pages); rcu_read_lock(); block = QLIST_FIRST_RCU(&ram_list.blocks); -- 2.17.1