From patchwork Sat Apr 22 08:35:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9694317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 96344601E9 for ; Sat, 22 Apr 2017 08:52:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F83E28304 for ; Sat, 22 Apr 2017 08:52:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 822C128621; Sat, 22 Apr 2017 08:52:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 446E628304 for ; Sat, 22 Apr 2017 08:52:10 +0000 (UTC) Received: from localhost ([::1]:34796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1qm1-0005M2-Fw for patchwork-qemu-devel@patchwork.kernel.org; Sat, 22 Apr 2017 04:52:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1qXF-00013e-NW for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1qXC-0003tT-Kl for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:53 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3510 helo=dggrg01-dlp.huawei.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1qXC-0003rQ-27 for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:50 -0400 Received: from 172.30.72.53 (EHLO DGGEML401-HUB.china.huawei.com) ([172.30.72.53]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id ANE70255; Sat, 22 Apr 2017 16:36:42 +0800 (CST) Received: from localhost (10.177.24.212) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server id 14.3.301.0; Sat, 22 Apr 2017 16:36:35 +0800 From: zhanghailiang To: , Date: Sat, 22 Apr 2017 16:35:25 +0800 Message-ID: <1492850128-17472-16-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1492850128-17472-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1492850128-17472-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.58FB161A.00A9, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 2cb1ea9d4f913b994d43591d49a552f2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.187 Subject: [Qemu-devel] [PATCH RESEND v2 15/18] COLO: flush host dirty ram from cache X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , zhanghailiang , zhangchen.fnst@cn.fujitsu.com, quintela@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Don't need to flush all VM's ram from cache, only flush the dirty pages since last checkpoint Cc: Juan Quintela Signed-off-by: Li Zhijian Signed-off-by: Zhang Chen Signed-off-by: zhanghailiang --- v2: - stop dirty log after exit from COLO state. (Dave) --- migration/ram.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index f171a82..7bf3515 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2775,6 +2775,7 @@ int colo_init_ram_cache(void) ram_state.ram_bitmap = g_new0(RAMBitmap, 1); ram_state.ram_bitmap->bmap = bitmap_new(last_ram_page()); ram_state.migration_dirty_pages = 0; + memory_global_dirty_log_start(); return 0; @@ -2798,6 +2799,7 @@ void colo_release_ram_cache(void) atomic_rcu_set(&ram_state.ram_bitmap, NULL); if (bitmap) { + memory_global_dirty_log_stop(); call_rcu(bitmap, migration_bitmap_free, rcu); } @@ -2822,6 +2824,16 @@ 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(); + QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + migration_bitmap_sync_range(&ram_state, block, block->offset, + 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);