From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIbwY-0008My-Gu for qemu-devel@nongnu.org; Tue, 15 May 2018 11:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIbwU-0001jC-PF for qemu-devel@nongnu.org; Tue, 15 May 2018 11:32:50 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33668 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIbwU-0001iy-K7 for qemu-devel@nongnu.org; Tue, 15 May 2018 11:32:46 -0400 Date: Tue, 15 May 2018 16:32:42 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180515153242.GC2749@work-vm> References: <20180514165424.12884-1-zhangckid@gmail.com> <20180514165424.12884-14-zhangckid@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180514165424.12884-14-zhangckid@gmail.com> Subject: Re: [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: Zhang Chen Cc: qemu-devel@nongnu.org, Eric Blake , Markus Armbruster , Paolo Bonzini , Jason Wang , zhanghailiang , Li Zhijian * Zhang Chen (zhangckid@gmail.com) wrote: > 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 Yes, I think that's right (although I wonder if it can actually be merged in with the loop directly below it). Reviewed-by: Dr. David Alan Gilbert > --- > 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 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK