From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGlE-0008MB-ED for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGlC-0005x3-Qi for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:44 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:40660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGlC-0005wP-K1 for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:42 -0400 Received: by mail-pf0-x244.google.com with SMTP id f189-v6so6306966pfa.7 for ; Mon, 14 May 2018 09:55:42 -0700 (PDT) From: Zhang Chen Date: Tue, 15 May 2018 00:54:20 +0800 Message-Id: <20180514165424.12884-14-zhangckid@gmail.com> In-Reply-To: <20180514165424.12884-1-zhangckid@gmail.com> References: <20180514165424.12884-1-zhangckid@gmail.com> Subject: [Qemu-devel] [PATCH V7 RESEND 13/17] COLO: flush host dirty ram from cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Blake , Markus Armbruster , Paolo Bonzini , Zhang Chen , "Dr . David Alan Gilbert" , Jason Wang , 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 --- migration/ram.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 4235a8f24d..21027c5b4d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2786,6 +2786,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; @@ -2806,10 +2807,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) { @@ -3042,6 +3045,15 @@ static void colo_flush_ram_cache(void) void *src_host; unsigned long offset = 0; + memory_global_dirty_log_sync(); + qemu_mutex_lock(&ram_state->bitmap_mutex); + rcu_read_lock(); + RAMBLOCK_FOREACH(block) { + migration_bitmap_sync_range(ram_state, block, 0, block->used_length); + } + rcu_read_unlock(); + qemu_mutex_unlock(&ram_state->bitmap_mutex); + trace_colo_flush_ram_cache_begin(ram_state->migration_dirty_pages); rcu_read_lock(); block = QLIST_FIRST_RCU(&ram_list.blocks); -- 2.17.0