From patchwork Sat Mar 10 21:22:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10274389 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 5C581605D2 for ; Sat, 10 Mar 2018 21:39:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4985928F26 for ; Sat, 10 Mar 2018 21:39:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3985D28F39; Sat, 10 Mar 2018 21:39:52 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 909F928F26 for ; Sat, 10 Mar 2018 21:39:51 +0000 (UTC) Received: from localhost ([::1]:52057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eumDW-0000Cs-Ql for patchwork-qemu-devel@patchwork.kernel.org; Sat, 10 Mar 2018 16:39:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eulxY-0002uO-HQ for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:23:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eulxX-0003Qy-F7 for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:23:20 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:43077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eulxX-0003Qi-98 for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:23:19 -0500 Received: by mail-pl0-x242.google.com with SMTP id f23-v6so7161962plr.10 for ; Sat, 10 Mar 2018 13:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Ng5StD/qge1fH0589n/nBkXQnchc0g+28X6DXcdkB4=; b=ZSVPrLFpfCgP1sSBLAx9A4Z+nzozUfqOxjzonf4YOBI+Q48bQpHqjfAtNX3fBFxVGI iiZEPOBtaR6W2PzBNwFsIpI82CyUui/2kgZksMg4laNJA6bw4h4C/NULZhVVLSqq0s29 Jq7iUTS0ljufbjFvJE13wuekN70fLkgNE8JAmgtd8QXdwd/lswMWh7AIUhxMNHJykFBm ZYxovDvq/JhxzNcSXZ4dG828B1Xk2euRmUg2R4a0vH6abe7BR9VfBIHIBehXA2WIQ4Tp xqd1b76+jjzoajD2RfisKr6FEJ7JelAuGt4vlAVEk6dK88ozjervDZtlFS1nce2aIDZm AQew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Ng5StD/qge1fH0589n/nBkXQnchc0g+28X6DXcdkB4=; b=F78wK5qmHsbEEY6u66yagTdOgozxUsm3jOPGYB2fWY86XKmBxBvQl9mY1fT+YZW8K0 GjEaos4GMF/rShihHPfP+NxFwv0MycmcU9snBuZ0HKfUTJd6IGcb6/VknBvEd5kO5tzo SKN3Gf+bSHJufnvSzP5w0BKfTH0WDyKLkPIz/isYfgfe6kHH9iNI7qEeOl8LwT3084UW 2ColHxh4hNJdQANY5fdfnG/+b+XbK/gG8s03Bnp0QsX+Jv6TC+YpVQ3azQuPT5X88eq/ 96B9SGA/JFoTwhBaqtG9IT49KSpuLM7MT4uzoUu1IdytyjfahVSK97m0jv5ADMGZwDm3 HFow== X-Gm-Message-State: AElRT7Ecvv5QoMzFwwr4irnriHA0PFd/PexAGdX3Aq9ar55p0b9vbnvg aqFrn7p2MAzHBh1TjlmeMLbaVfUm X-Google-Smtp-Source: AG47ELuEmYCQi6ySERFa4s0qO41q1eYG511tO6EwZJJoBmtriPfAuPonRHA5EEroxTZXC/PNn0mcJw== X-Received: by 2002:a17:902:4222:: with SMTP id g31-v6mr3160842pld.335.1520716998169; Sat, 10 Mar 2018 13:23:18 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id q65sm10532191pfd.140.2018.03.10.13.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 13:23:17 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Sun, 11 Mar 2018 05:22:03 +0800 Message-Id: <1520716927-17068-14-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520716927-17068-1-git-send-email-zhangckid@gmail.com> References: <1520716927-17068-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH V5 13/17] 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: zhanghailiang , Li Zhijian , Juan Quintela , Jason Wang , "Dr . David Alan Gilbert" , Markus Armbruster , Zhang Chen , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 ff7265e..003617e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2685,6 +2685,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; @@ -2705,10 +2706,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) { @@ -2938,6 +2941,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);