From patchwork Wed May 3 10:52:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 757948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wHw4s01cwz9rvt for ; Wed, 3 May 2017 20:53:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fkboN+cD"; dkim-atps=neutral Received: from localhost ([::1]:35766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5ruk-0005Ge-Er for incoming@patchwork.ozlabs.org; Wed, 03 May 2017 06:53:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5ruA-0005GS-49 for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5ru8-0006g2-DP for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:10 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:36604) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d5ru8-0006fi-7g for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:08 -0400 Received: by mail-pg0-x241.google.com with SMTP id v1so27770703pgv.3 for ; Wed, 03 May 2017 03:53:08 -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=bE892JZRUzoSj0VrefTDrj45cFJ2Kapg9kWCvXU2yV4=; b=fkboN+cD99opXF5qY6wRpYT1yXQBrv7zuwykkGw+AZSUIXyRBEjLC9Rlv/GTye4hAC i4dHSXaZUIchWQZMCejUsglxzR9KB6N2cBkwgDBrR0mfKyJqiVMPIpxub9zp+HNhriI9 S60NW+pAQ2Peg8Xq/YP88xCO20YC+DGKqJE2dVPSAGiTJqxs+Uuzgtnu32JApxHQlqIs fbPgj1/Bj7In19a0bAR4eR2VNVv2qoWt6djJvwis0/Suz9wZFbpWqgOsWE/C4TbU2slR lZT93hppq0OYEcsVPWsH2aQQ7PFGfxmHMyjVo2o3ikZyvOpQgWVplouflQ1HomfHvNwi DPmA== 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=bE892JZRUzoSj0VrefTDrj45cFJ2Kapg9kWCvXU2yV4=; b=dQS0Dk41cdjsYahPH0JQd2wA+HMS0UK4FMpN+BiGUzoYii9wIvv6UzokJgl3f64g0H q/QBF2aeXkbEEBXvQ+7jvmn29013nt48qMAFJKlSb/uI+75NWqfwzCr4Fzh/fFCM0osb hX5uLfr8+ycXTjLvle+Fu4NSpY1dQxGxjltnLnCyjO7EFJxLsu7Bv72fH5ndsLO7ZoS/ TkyZcJOl+GEUcfhIeDhSudCQx1qIgFwLr92EkUX8mpOGrVeqQ4Ji2jfAfVR0/+/KiMy5 hf51dodqGp5EIP3IHjX75dlI4C4BxdA8R/N8fDDjc+ZLEwDW+seOLFDpwevN7IvGt475 56Gw== X-Gm-Message-State: AN3rC/4DN7B9IpJYbVsr3EnTv7N+s5KDrA1V4N0GmRztQXs4NL7RdegR d3BCINRRMdGqOw== X-Received: by 10.84.241.136 with SMTP id b8mr48610500pll.107.1493808787378; Wed, 03 May 2017 03:53:07 -0700 (PDT) Received: from eric.tencent.com ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id d24sm4395561pfb.97.2017.05.03.03.53.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 May 2017 03:53:06 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mtosatti@redhat.com, avi.kivity@gmail.com, rkrcmar@redhat.com Date: Wed, 3 May 2017 18:52:18 +0800 Message-Id: <20170503105224.19049-2-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170503105224.19049-1-xiaoguangrong@tencent.com> References: <20170503105224.19049-1-xiaoguangrong@tencent.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 1/7] KVM: MMU: correct the behavior of mmu_spte_update_no_track 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: Xiao Guangrong , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Xiao Guangrong Current behavior of mmu_spte_update_no_track() does not match the name of _no_track() as actually the A/D bits are tracked and returned to the caller This patch introduces the real _no_track() function to update the spte regardless of A/D bits and rename the original function to _track() The _no_track() function will be used by later patches to update upper spte which need not care of A/D bits indeed Signed-off-by: Xiao Guangrong --- arch/x86/kvm/mmu.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 5586765..ba8e7af 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -583,10 +583,29 @@ static void mmu_spte_set(u64 *sptep, u64 new_spte) } /* - * Update the SPTE (excluding the PFN), but do not track changes in its + * Update the SPTE (excluding the PFN) regardless of accessed/dirty + * status which is used to update the upper level spte. + */ +static void mmu_spte_update_no_track(u64 *sptep, u64 new_spte) +{ + u64 old_spte = *sptep; + + WARN_ON(!is_shadow_present_pte(new_spte)); + + if (!is_shadow_present_pte(old_spte)) { + mmu_spte_set(sptep, new_spte); + return; + } + + __update_clear_spte_fast(sptep, new_spte); +} + +/* + * Update the SPTE (excluding the PFN), the original value is + * returned, based on it, the caller can track changes of its * accessed/dirty status. */ -static u64 mmu_spte_update_no_track(u64 *sptep, u64 new_spte) +static u64 mmu_spte_update_track(u64 *sptep, u64 new_spte) { u64 old_spte = *sptep; @@ -621,7 +640,7 @@ static u64 mmu_spte_update_no_track(u64 *sptep, u64 new_spte) static bool mmu_spte_update(u64 *sptep, u64 new_spte) { bool flush = false; - u64 old_spte = mmu_spte_update_no_track(sptep, new_spte); + u64 old_spte = mmu_spte_update_track(sptep, new_spte); if (!is_shadow_present_pte(old_spte)) return false;