From patchwork Fri Jan 19 13:44:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10175343 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 93E7960392 for ; Fri, 19 Jan 2018 13:53:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 852BF28543 for ; Fri, 19 Jan 2018 13:53:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79CE428698; Fri, 19 Jan 2018 13:53:39 +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 1A1A428543 for ; Fri, 19 Jan 2018 13:53:39 +0000 (UTC) Received: from localhost ([::1]:50465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecX6w-0001CQ-DT for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Jan 2018 08:53:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecX09-0003pg-4E for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecX07-0003Hx-NN for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:37 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:38930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecX07-0003Hb-I7 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:35 -0500 Received: by mail-pf0-x241.google.com with SMTP id e11so1392661pff.6 for ; Fri, 19 Jan 2018 05:46:35 -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=KBf9N7x+ZU7xkYOlauplRvR3IwUKA84kyNXw2mc4Z0M=; b=WXLAS3JInljX/R5BgxI7xOs8mKYldTOsqqMITVV7ErXmdXTY3o//vwQ/SuSx311nFK Oq6hnwHjH4meo6oA6ozMPhXl+jIs7rD9SGXWFDLp91mVL9ZgiGXxe1rhsTuKhgILHwJs SsAANHbHMJjKNkfPMdwYhP07BohGbgBd443bYxOJYQIDr6dJ4NLZrnWtmsjRWyPMuKl+ dae4bV23EwF1NPJmUKarybySW1vqzKfsqcuL6C8M8ltfjDEo2utLIKVoqmexMYpEhwXR uluAUaYASAnKBg4pRPDw5VpZ8n2MCdqSUaWZsYM9UtAab4p17EygTELuLjsDagUKYcv4 Xq+g== 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=KBf9N7x+ZU7xkYOlauplRvR3IwUKA84kyNXw2mc4Z0M=; b=kAYG15eXGHHC49vV1TnEn4AQUiAC5IvlR0nNcuiuiJsOEuJAezAcV8ocuYzwg0HdZn fl0vkh07uxPJABQb5wNw/jzHMvmBerV3l3aSukqlKtYl94MBo+kzKFXVaNG0Lo4hMKJ4 qcsjWtFaJb7kTMXy18tBnpDTPi5AwtYB8lp6i9K4pkgHzckMcZ4vzeme4EtP4xBP0tS6 txEk4t37nKtXcz/eoqZ183LZyo7h/RMAr8XraGl27whTtKNQIzcU0+XfLMHp6OiIHPhe 7GtvHbw83CXNNFuQYN5Rvd8avMQqn73D2UgCcIQG3auMsVAE28he9yMk16EVVqWVzqse sRJA== X-Gm-Message-State: AKGB3mIE4taEGcpy6Dh4/DoqpbgTL2nyRoRP8HTW8psmKZLK8btZBFN/ AJcWWDPjaMduN8eUij0TM8tSx/ef X-Google-Smtp-Source: ACJfBoubw0Sw7mJZmpIfGcx1MY+XAz0vXtdl5t7SmplZzMwzObqIW7Gcj3/vUwLux3ukTl2o+bby4g== X-Received: by 10.98.60.67 with SMTP id j64mr40083211pfa.217.1516369594227; Fri, 19 Jan 2018 05:46:34 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id r88sm14251865pfb.17.2018.01.19.05.46.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 05:46:33 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 21:44:37 +0800 Message-Id: <1516369485-5374-9-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516369485-5374-1-git-send-email-zhangckid@gmail.com> References: <1516369485-5374-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:c00::241 Subject: [Qemu-devel] [PATCH V4 08/16] ram/COLO: Record the dirty pages that SVM received 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 , 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 We record the address of the dirty pages that received, it will help flushing pages that cached into SVM. Here, it is a trick, we record dirty pages by re-using migration dirty bitmap. In the later patch, we will start the dirty log for SVM, just like migration, in this way, we can record both the dirty pages caused by PVM and SVM, we only flush those dirty pages from RAM cache while do checkpoint. Signed-off-by: zhanghailiang Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 6460777..d916da0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2478,6 +2478,15 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block, __func__, block->idstr); return NULL; } + + /* + * During colo checkpoint, we need bitmap of these migrated pages. + * It help us to decide which pages in ram cache should be flushed + * into VM's RAM later. + */ + if (!test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) { + ram_state->migration_dirty_pages++; + } return block->colo_cache + offset; } @@ -2654,6 +2663,24 @@ int colo_init_ram_cache(void) } } rcu_read_unlock(); + /* + * Record the dirty pages that sent by PVM, we use this dirty bitmap together + * with to decide which page in cache should be flushed into SVM's RAM. Here + * we use the same name 'ram_bitmap' as for migration. + */ + if (ram_bytes_total()) { + RAMBlock *block; + + QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + unsigned long pages = block->max_length >> TARGET_PAGE_BITS; + + block->bmap = bitmap_new(pages); + bitmap_set(block->bmap, 0, pages); + } + } + ram_state = g_new0(RAMState, 1); + ram_state->migration_dirty_pages = 0; + return 0; out_locked: @@ -2673,6 +2700,10 @@ void colo_release_ram_cache(void) { RAMBlock *block; + 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) { @@ -2681,6 +2712,8 @@ void colo_release_ram_cache(void) } } rcu_read_unlock(); + g_free(ram_state); + ram_state = NULL; } /**