From patchwork Sun Mar 11 07:45:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10274549 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 90BC760211 for ; Sun, 11 Mar 2018 07:55:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85DDC28DE5 for ; Sun, 11 Mar 2018 07:55:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A2D828DEE; Sun, 11 Mar 2018 07:55:48 +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 0215E28DE5 for ; Sun, 11 Mar 2018 07:55:48 +0000 (UTC) Received: from localhost ([::1]:53397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euvpb-0006GD-9E for patchwork-qemu-devel@patchwork.kernel.org; Sun, 11 Mar 2018 03:55:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euvgc-0006eR-BZ for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euvgZ-0000xW-8p for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:30 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:33497) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euvgZ-0000xD-31 for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:27 -0400 Received: by mail-pg0-x242.google.com with SMTP id g12so5255580pgs.0 for ; Sat, 10 Mar 2018 23:46:26 -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=DUKp+QVgv1s4DQN4bexaJvM7MK8EwycHY9p5dvZ5cHJEst6FMhvofpYRT4uC+kEbW1 GXPX/d/20Sb5woIi785z34SKEAMuN++bWljdfWTGyzWIpt7t+FEzGfNZwUwH4AvAgJ1P VTX2gLAZndaE/Qc1yzNHsFloEImMREkzt7ugoCNgtKgYTIQrfOv5WL1R5QzAz8t3zBG6 LadUHO2A9fgGzVVCdMKYC8wPnwpBdRUBbuK6fvhufeemSWrWHdKZSPl74rvYS3KGqu14 AwbrQsDm4288Rrvgqw+Fu3KyyroudRR9Ijg6oZZETkKzTQoW4NwsgRlrM+ojurLQgbTq /pBQ== 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=ql9HGrrTt0ZTDYodglNUDvyJ9avkTPlDtjzeBHKOMfUDVI4PgYKqTc4J5RScWrA/Jr o9I5c4OjyAIh914ynejuOhhaKyt0Gu4nLOoH0vFZFb+mfmP8OHXt+byd1n7ZCF8z3WsO +rHrT6lgeAk5Ku5NjaaKCfvKA7mIULpp50nsrVHBa8f60MoK1lsUpzznwM/ZWrGCZYe2 j+5JPWhp05XVyz3aGNlwnMEfCXchXM+6Kgacdj64CWZpW9nVL/O3gISSpOX9GziQquGP sBDUby6E/N/BnTsUP32HkPgsuqhPQ/97FxUJ8FGutUamhFUOzE5jO5jghq9SXlx1TIFB dHaA== X-Gm-Message-State: AElRT7G8QA78IUQLxD7KZAsmkhtn/zyyCZWvMbWgR53YIgHlvZvBV4Zu rIejNMAhxjOAeCofEcfQNuSTovKm X-Google-Smtp-Source: AG47ELtX01wzN6h6oGaAye4mModZj6ZTZrSwLwFOP8q+cozfXOVbTl3cCYd+QB4Ci8pstJEJs0uu6w== X-Received: by 10.99.127.65 with SMTP id p1mr3460143pgn.141.1520754385870; Sat, 10 Mar 2018 23:46:25 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id t16sm10917037pfm.69.2018.03.10.23.46.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 23:46:24 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Sun, 11 Mar 2018 15:45:10 +0800 Message-Id: <1520754314-5969-15-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520754314-5969-1-git-send-email-zhangckid@gmail.com> References: <1520754314-5969-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:c05::242 Subject: [Qemu-devel] [PATCH V6 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);