From patchwork Sun Jun 3 05:05: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: 10445139 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 C2A7160234 for ; Sun, 3 Jun 2018 05:19:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3F1728989 for ; Sun, 3 Jun 2018 05:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94745289D4; Sun, 3 Jun 2018 05:19: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=-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 2857928989 for ; Sun, 3 Jun 2018 05:19:11 +0000 (UTC) Received: from localhost ([::1]:33692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLQ5-0000tT-Qe for patchwork-qemu-devel@patchwork.kernel.org; Sun, 03 Jun 2018 01:19:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLE3-00007o-2y for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPLDz-0000oz-Sv for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:43 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:33388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPLDz-0000om-Mp for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:39 -0400 Received: by mail-pl0-x241.google.com with SMTP id n10-v6so17652415plp.0 for ; Sat, 02 Jun 2018 22:06:39 -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=q3oXufUhbNT/jJgQ13BaKw2rdL3qWs/wrQJitoG3FJI=; b=HvJhh5rh9XUtoO5cW5RDvUpZITHHne1X7urZUVnlCdrpS0NOO9Y6HnfnkZl9xpLNdU sE0Sw95cgtsVaL5IFIO+W7anXFpr7FD9CGnrmEfOHACV84n+MDzC8z9BrvBQ5ujBPxWJ aNG3z+rju23ySdrWlk0nAqpSNKBVP7kPU0zlk8u0pnF/Jt85ifchDLE1kD553yKl5G7u J1WBuh+YPBRN1UXgN1txuNGxxsdXaKFiP1PjAu5CZiOJMfM2o7raS3km3cc3rH1jXQWt TgShymMHp128s9hZCQQ6psEdQwvB5/H/10bKO9dkCbptYWRDYqE7C7bfgQ2KByKbVz8y ty6w== 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=q3oXufUhbNT/jJgQ13BaKw2rdL3qWs/wrQJitoG3FJI=; b=KntVUgm2fgLSqHgWrvdIZalfxiTJNU3O6pAMUBNUadUmCWtQOtZIoCTrToVxHr8ORx 7gN/RV9eLC+m/evkiOcSWjDFBR8z15ttaG0v6edGySTKIh04jMKqHZraTise2Z6z+nIK BCcT6ghlxFwX9P60u0Lp6aCQ3qW0w/4FNo54UxLlhC7M0ZZasRTECXkQqyiqT7JinUpc 1zWedFMd44VfFmrfsWrHOmZCk/6+2v3KaOiZb/GmlTbXG740aqMUnAZEGojVdy0Qfnmx rssbmwFqyBCbEXHrTgeqoRv55hcVw4Mivn7lMPb9gKPzDCBWKgpMonf6cIYCMEvBNPjE bXAg== X-Gm-Message-State: APt69E1p5m+GENk0K3p6O6SYv7yKcJiUXDOw/piMO0SJz23dcgF0VwXn +5+W57iULS1AVU9tx9sX9uwtww== X-Google-Smtp-Source: ADUXVKIJ9+JulWjZZJwUDiB860tm3Nv9OuTTvZoKiXXRQFdWynL+tpzN+PklbsZYE9ndpM1VeIXweA== X-Received: by 2002:a17:902:bf43:: with SMTP id u3-v6mr4936107pls.322.1528002398559; Sat, 02 Jun 2018 22:06:38 -0700 (PDT) Received: from localhost.localdomain (197.225.229.35.bc.googleusercontent.com. [35.229.225.197]) by smtp.gmail.com with ESMTPSA id 10-v6sm45841595pgb.40.2018.06.02.22.06.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:06:37 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Date: Sun, 3 Jun 2018 13:05:37 +0800 Message-Id: <20180603050546.6827-9-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH V8 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 , Li Zhijian , Zhang Chen 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 2bcd70659f..dd86eeba87 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2831,6 +2831,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; } @@ -3061,6 +3070,24 @@ int colo_init_ram_cache(void) memcpy(block->colo_cache, block->host, block->used_length); } 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: @@ -3080,6 +3107,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) { @@ -3088,6 +3119,8 @@ void colo_release_ram_cache(void) } } rcu_read_unlock(); + g_free(ram_state); + ram_state = NULL; } /**