From patchwork Mon May 14 03:23:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10396809 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 CE34E60216 for ; Mon, 14 May 2018 06:46:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B978328701 for ; Mon, 14 May 2018 06:46:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACDC828EA0; Mon, 14 May 2018 06:46:14 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 E9BB528701 for ; Mon, 14 May 2018 06:46:13 +0000 (UTC) Received: from localhost ([::1]:43978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fI7FN-0000q8-7c for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 May 2018 02:46:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fI6e7-0006dK-9B for qemu-devel@nongnu.org; Mon, 14 May 2018 02:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fI46T-00008p-S4 for qemu-devel@nongnu.org; Sun, 13 May 2018 23:24:53 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:36132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fI46T-00007R-MY for qemu-devel@nongnu.org; Sun, 13 May 2018 23:24:49 -0400 Received: by mail-pl0-x243.google.com with SMTP id v24-v6so6521943plo.3 for ; Sun, 13 May 2018 20:24:49 -0700 (PDT) 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=IH1bphaxcG2LjizEZBLNyCH28G/Lq2miAkn26IAeS2k=; b=nOu9gd51rRQ1aYwlLGYDUREmL4E/SXvEwtN94yn9wdazJHZNjtaevT6Pe3INaRfTcm PUtumi3cz7VXDYb6IWhywmv8lFJCzhZuYuLZrf6OvnKI9okv/2KzqQLxf0PLlw+Quwoz D55fQKLqhdmpBy8DDAx9oDt1z7M10D/yam4jsBGrgpldtSdNlZJNHrOrq/eC/DCPtiUa zmi1hw0R1/gRHvW3VxAjy1omSno9aaSvlkpSzpcCRiUZXaTVa3dUuaM5uX9MdHja88ii 5m1oUynHhRdGY2ZQwoXcBYcZHaMyDGCk9URA8oc3NORMoiJIYRVZQyWeMhePrWiNE2Cy wN2g== 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=IH1bphaxcG2LjizEZBLNyCH28G/Lq2miAkn26IAeS2k=; b=M8x2V0h/DeLPEpw4D1jQ9L1pjsuw9foVKrRy8s1bjrJz83i8X9v/e8DwG3D8Z2TRqy agTb4LO3xNpR/TVfCDB1884Q48umR5lk1gUUh6yqxNwNcdSxap8SCPD4yWFkydWj0LJ2 FdZah3gKvf3LDzH3NwR9oIyeyQuoF8wEPsNRMFhiqhz+cc6QuWBvwsLI+zL9CfJr5p3V S+uT2DBJM5M4rbA4nXYG0OhlAAhgdfsarv2laAw4xO9jIdFJofMZK+KdJc0JkVakAetJ 4JNVfermyNAcucOROOvnYBA6Vg2zTfno20GxWAWTc+fNO2SzsN+vC5uKLYV5HDNMP25B epWQ== X-Gm-Message-State: ALKqPwdyPQi6koVa0e7hqXj5XcLtsFddmu/3R94D6A+/WHOBivfsc+dh izGzRwY6HNmpy7D1gEn5PGaURg== X-Google-Smtp-Source: AB8JxZpFlLf2htTQ6YxGNRtT+PvBalrwu2T5M6KfP0+tNMZHOefr66a3NZjNZZNuV6JLWinOFo5APw== X-Received: by 2002:a17:902:bc49:: with SMTP id t9-v6mr8078951plz.109.1526268288498; Sun, 13 May 2018 20:24:48 -0700 (PDT) Received: from localhost.localdomain (109.227.199.104.bc.googleusercontent.com. [104.199.227.109]) by smtp.gmail.com with ESMTPSA id p6-v6sm17183532pfg.157.2018.05.13.20.24.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 13 May 2018 20:24:47 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 11:23:39 +0800 Message-Id: <1526268228-27951-9-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526268228-27951-1-git-send-email-zhangckid@gmail.com> References: <1526268228-27951-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::243 Subject: [Qemu-devel] [PATCH V7 08/17] 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 , Jason Wang , Markus Armbruster , "Dr . David Alan Gilbert" , 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 7ca845f..e35dfee 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2531,6 +2531,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; } @@ -2760,6 +2769,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: @@ -2779,6 +2806,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) { @@ -2787,6 +2818,8 @@ void colo_release_ram_cache(void) } } rcu_read_unlock(); + g_free(ram_state); + ram_state = NULL; } /**