From patchwork Mon May 14 16:54:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 913128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y6+YMKae"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40l6cF1HDcz9s0W for ; Tue, 15 May 2018 03:09:01 +1000 (AEST) Received: from localhost ([::1]:47327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGy2-0003Ey-Pt for incoming@patchwork.ozlabs.org; Mon, 14 May 2018 13:08:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGkq-00081D-Rr for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGkp-0005fF-9x for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:20 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:33924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGko-0005eb-Pq for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:19 -0400 Received: by mail-pl0-x243.google.com with SMTP id ay10-v6so7712632plb.1 for ; Mon, 14 May 2018 09:55:18 -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=bJnSGsF2KcrHZo4L+iZB0TIE8jxs9cp4Oz7/H3wjRgc=; b=Y6+YMKaeRzVojzG6mQu5JyHs9I0we/T5FbEgyvml9m6K1uFkCQj5+Vr9CwDh0elUsi SJYiKNjdzcuTdu6Lr7z2BBTUwTkUEnvO4R1uhbrMF6rX/yE5IKIe1SYEwRLUyr5en1sF bKnJzcwmgRIa3fUGl8/RECPEDl0XJjmdfatEWpwwlFy4dcqrdF+2QTTrfHghs9B1R5A7 Sw+ZSHhIvw9YUxuenMZpcobLSPdXrno1L2u/sBy4jji7WmhuOdivdU66fHFlksoOgY8d xtJCRuHmYrs2qGZQbWc+4Y5zvD0B+AU5oDUGfCAMw0Km5gM4rY+Dtqswdz7tcrBT+FMl IP1g== 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=bJnSGsF2KcrHZo4L+iZB0TIE8jxs9cp4Oz7/H3wjRgc=; b=dstLpp0QHXxPqlccF5QWMC6wArnPrdu+4Skjc7TFOJAJqvKYMhFUNeGdyJ1ZsZ2IQ1 YMXIygujdKdUzxcdvLEcyOb6XNuvhS1Z9za3GW6emGUBHtBRT+gQJzOfkJ+1kKC8F7CA WHT9jMKq8WXiE0MX1L6URh80toyeBs21Hb7oxMON1+7ltXnmU6waH+Nu+NbqNsfmUDCc CaVt0aPmPQCxKmxUxrkwCC16ltmierUNYLZPNAQQhSJ1v36bAITXnzjy3vI40SvPUvsL dAE3C6xTPwR7dgU0c5VCeoqGtdkT/60SdnmANbpvbz4bQj0/fyfJZ0NXwg/XnKpFb9yw 4Mhg== X-Gm-Message-State: ALKqPwc6cWibTCtsfbJuWUq/uFAXjfQdW2XPMd5rQM/rMlI/+ME03iUH EuBnUrdShiORmKe8LSS5YwoSqA== X-Google-Smtp-Source: AB8JxZpzINtX9s+zukcPHfavDO3y6vs1J1hyB+F9J6i5iIMcajAz/+pTg0Aq9SVg9HM9JEMzmeOf4A== X-Received: by 2002:a17:902:9349:: with SMTP id g9-v6mr10451285plp.375.1526316917417; Mon, 14 May 2018 09:55:17 -0700 (PDT) Received: from localhost.localdomain (109.227.199.104.bc.googleusercontent.com. [104.199.227.109]) by smtp.gmail.com with ESMTPSA id u69-v6sm631448pgb.42.2018.05.14.09.55.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 09:55:16 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 00:54:15 +0800 Message-Id: <20180514165424.12884-9-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514165424.12884-1-zhangckid@gmail.com> References: <20180514165424.12884-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::243 Subject: [Qemu-devel] [PATCH V7 RESEND 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 7ca845f8a9..e35dfee06e 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; } /**