Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jon Kohler <jon@nutanix.com>
To:     Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        "H. Peter Anvin" <hpa@zytor.com>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Jon Kohler <jon@nutanix.com>
Subject: [PATCH] KVM: X86: correct trace_kvm_pv_tlb_flush stats
Date:   Wed,  4 May 2022 14:27:07 -0400
Message-Id: <20220504182707.680-1-jon@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3RcRWUqZ6mKOIZyFHHJxM1wr7pylLBU+UeOPTqcZRi8cL2AdKZSxg8rJ+c/U?=
 =?us-ascii?Q?dmgSI9l/RthE7KGiPLZbah1JZxDID7znjUk3S/ep+EyqVutxIB8fopjiSoMv?=
 =?us-ascii?Q?GCnt41ovRIG82uq7Q9lqRjwxfdGjXvGETFxKEbh63uStItaTq6+xi6tJJDKx?=
 =?us-ascii?Q?rvEH6tdty/QKJWtZBYO/RR7lCDLaECJRrsIL6NaeV6d14oyz02FhX12pi/pb?=
 =?us-ascii?Q?JYkkx340ESiOvUMWP0v5xoiAwyMVqjsJEv94A4eRiYyOJkz32Lf8Cp3S6BWS?=
 =?us-ascii?Q?6eR5MHH7QkSCxsZgPAjlXQ3rV3KgYjYuYCFabxYD2wtXXndBx2RUa7lU2jt0?=
 =?us-ascii?Q?W7x+W+r6Poq6NIgcb3wLtj0IBth1JcLWl+q2dSoUE8pk0DxaOZ2B5dquoJjs?=
 =?us-ascii?Q?NA7ZWWxVT4go9F+pLFyPdBTf0kFR/3hPgoVS+lNLXj7kp45t6cLDdhEhuOjr?=
 =?us-ascii?Q?qAt5ICw1eN3Su3PJGQ3uczNSFo+4KbR8MczMkjtNnIiNX2pA0XTsB16yvG2f?=
 =?us-ascii?Q?PJtH6mtKqQsBXAWB+6mNR6QejL8BusN+YvSPdvPoUgLM2+le1JWu7z2oeiSk?=
 =?us-ascii?Q?8uNpg3R6PBc1XHvltDPkm/h3uOQHqG/ZSEAvkh0XgnWtJO1SuLFLhggHASbM?=
 =?us-ascii?Q?9S0/X1zKNYvl8g6rWR7WR0XNpNIJbT9jfw2O5qN1MPg9LNFH5atmjISwqLH/?=
 =?us-ascii?Q?sm4VwCs89JPISyUPz/QDZ3bfG+yoXncOipmpFTmnqlJCTHCwwZp8hXXYSj2U?=
 =?us-ascii?Q?dyTWuw5Jwy2CMOdNHU2cmMZnEjdfeb27HbyXyzyymZpQbkJ3/zdAyTNzNrV4?=
 =?us-ascii?Q?vBQKTmDR0ddx2NbTMzjsgZkdYDQHhgGrNNPpW77+4yGodxQWCsHHWjyInoNq?=
 =?us-ascii?Q?RlRDxzwySPW4TnrIvl4SgRLPqjjSnutfi42bufxcHhEovZ690dHr5lodUCZr?=
 =?us-ascii?Q?9iV2YOMe2uF1W1r/YHLrsTLJFSPr19h3CUvZXxgbrmW1862lcv4s/RG7HaRj?=
 =?us-ascii?Q?6wGH7ruecgurtG5L6MIXVJzqBcIs8MaCMyvabn1juzRZKsKlA1zPHLzXiLof?=
 =?us-ascii?Q?Spt0wT/tad3E+P2BoSRaqf1R8piyDwgHm1uEmajTo8aj26xzLQDQ/6K3JFfI?=
 =?us-ascii?Q?4pIGwWvqjN+0cuWRcvgGEkAIE3U8o+ul5Sy6viVRaPOf/7y1nrNa4BR8iVRB?=
 =?us-ascii?Q?nFqB6VgDq+citIGg1VKrpQCV9RTFqx14uI4e0K0mau58TzAyPAWEGtvTGIeM?=
 =?us-ascii?Q?Pfi6qSXrU3xeVJtpfBMvbZfWfbmN/MbfL3+3oEuMDSUUd9wpElNbUOs2gcCw?=
 =?us-ascii?Q?E646CSEtMEBwxAeADG6fAM6vuXPS4ff24KFjKRHx5QMI5L3cMR3+taA2pIkM?=
 =?us-ascii?Q?g+tWG+fxc8sZrTHYG7DvMbLRn7EyU3pchL3TUb7Dn3MYgah5P58TD6OFfkx6?=
 =?us-ascii?Q?bLj8K9Vq6RdPh+FOfhRBt1snPzU9DGvXapuK3qfHsQ0Iw9cFPhFNWFwa3qHJ?=
 =?us-ascii?Q?kpCU6mRnIfc6NW3VhuLyO3Dj0u4lBDwZBLSJtPFSiiNc5EAyLCzer2xame6F?=
 =?us-ascii?Q?ErN0+W2jALWAttjmgZx6du3+HbNYmRUyvRIa7BaRGincU9tsbw0DSbTudFmV?=
 =?us-ascii?Q?1/F15tK/nSM3pQPpnvBYzAVpylnBOoHRRVQXFW17jEf0TzlZeVkw+2cIfQRy?=
 =?us-ascii?Q?99Ctdz8yLFNg03rDfiL4YYsxY8Yzc3DRk3qSac0XciY8ftqSa6wNHGC5rxnA?=
 =?us-ascii?Q?JMVbDRvY+rMsFQifv8HTw1WUrcCI1iRPSsgpVlDZ3al/5Lwxh8bn//17uGLv?=
X-MS-Exchange-AntiSpam-MessageData-1: Zr7yVzuKsTA1aOo4SSP7Y2hegjWefMNxY40t7PG3hpUNvd8iInfNNZV7
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 69982b80-11d2-4f21-0301-08da2dfbc029
X-MS-Exchange-CrossTenant-AuthSource: BL0PR02MB4579.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 18:27:31.3894
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LaUN4IgKcARFbaZ+GrAMu4VlqOLoZM6uLrFanrhejCJ9u9f5Ga4xLu0fRZDhAMoX28PtxcQJXy6rDDzZGzv4RC22dXvhyii7RPipegSod64=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8030
X-Proofpoint-GUID: U3A-P420u-siQDLWFQJts0_ZlYc8pqBg
X-Proofpoint-ORIG-GUID: U3A-P420u-siQDLWFQJts0_ZlYc8pqBg
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-05-04_04,2022-05-04_02,2022-02-23_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The trace point in record_steal_time() is above the conditional
that fires kvm_vcpu_flush_tlb_guest(), so even when we might
not be flushing tlb, we still record that we are.

Fix by nestling trace_kvm_pv_tlb_flush() under appropriate
conditional. This results in the stats for kvm:kvm_pv_tlb_flush,
as trivially observable by perf stat -e "kvm:*" -a sleep Xs, in
reporting the amount of times we actually do a pv tlb flush,
instead of just the amount of times we happen to call
record_steal_time().

Signed-off-by: Jon Kohler <jon@nutanix.com>
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4790f0d7d40b..8d4e0e58ec34 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3410,9 +3410,9 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
 
 		vcpu->arch.st.preempted = 0;
 
-		trace_kvm_pv_tlb_flush(vcpu->vcpu_id,
-				       st_preempted & KVM_VCPU_FLUSH_TLB);
 		if (st_preempted & KVM_VCPU_FLUSH_TLB)
+			trace_kvm_pv_tlb_flush(vcpu->vcpu_id,
+				st_preempted & KVM_VCPU_FLUSH_TLB);
 			kvm_vcpu_flush_tlb_guest(vcpu);
 
 		if (!user_access_begin(st, sizeof(*st)))
-- 
2.30.1 (Apple Git-130)