From patchwork Thu Mar 7 01:13:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13584945 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2DE11FBB for ; Thu, 7 Mar 2024 01:13:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774031; cv=none; b=jnuZIdG+BdGZ1m4biUGFwAflXC5eACXBjLQRXA6HG4u6WGTpjPeMcbZg6eqLhEHE1k1Iljnk3wophB/CqAM3wNgMgtGiz72kLvWbK8pgmzS1o7iLEKA4Pnp4WfauH5PULLjVr2rsZ9dH+xnnPvBAF856O0fjxzh97roeEj4dbko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774031; c=relaxed/simple; bh=AVNvdObNYsvBPRRwBeScCDec7JNA2zRkhx+8VadcPaQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OxWKhWH/e5Cdz/CIZlz76K2xO/NvY383rVRU7r5uW8uDSXByBdWjq7Yw4xuqk7bUGBSWibYyXH1mfkINwLiyZnlMXr1h0x+EmiZ7fHw7fZIRXWmNlKaBmGUPI9vLgzolso+zcVpc05SoHdDAbBpev4anheuJ1mNsveyWbSkXFDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Rx+W4kyP; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Rx+W4kyP" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6096493f3d3so5795217b3.2 for ; Wed, 06 Mar 2024 17:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709774029; x=1710378829; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=d9OkLWkUpGFKgtUTAFhUfP4KpjC4oBcPSpydtAFPWEY=; b=Rx+W4kyP8nbTCsQFCieZSroaLaXIGarCskUht94vg6kNKpZTE+W+gFdluMIxNo5XaT 5EXK1AlfSWXqb0AqX41Lrq9iP/hnN9/c8HaizZWKakq8wXiiJVnD5lWBbrfBnIxJXORG Qi8rSuWXg5CgxuS2WZIQ78iGiVoaj2Fv0AuIlUfFtaRI3ft2Z+oVOBdNIcJIEIFr+AAj gB3lnLq9v6CEPd7EyNdCK1Fe49LCSM6wulwMLwT4s45hupv+goeRNXJPSPOm4d7vtMEb 4HTCwipQBfw+P+2l+vYwxnEa/Zlw3g6UdZ24y1T0/cP/yYp5UczMfyG5QXZ1n+d/26lx ad5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709774029; x=1710378829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=d9OkLWkUpGFKgtUTAFhUfP4KpjC4oBcPSpydtAFPWEY=; b=dLV7M2Pj8zHQGarFgQOdtpyWnV0KXDPPWB7U4vpAtrpCFpIuHodATLXwxUSH+mG3qc qkrCDKiXQDIGN+PTCJf6x2QGTJgBjU1+W9zREVBVFgCu2KoIhrRs1qNgBVCz/rtM86uM oZHgNQTxGAzGd7uz4WVC6+Hzmye03xp5iXKCBKfujCk7Xt4KOM/sSzbA6zC/yrJvXZda CwJYr2uxPSf3biLoFTT3RVuNt1gAM4k704wYKY+MSaP7S8HLaqI3MSs/rkqonkPhj3V/ Rd2IZrQM1Wcb/ElwH7Gx5R0DuaiqonD7oRrlQsoLseGwSLwIZ6ZyScuVCMp+Zh6+5Q+w k1Xw== X-Forwarded-Encrypted: i=1; AJvYcCW4nglhwm+qCh897O4N7VWSoa9q4zR9gDfjQuS566ny9yrpyiyJR5cx+osBnQxbJbSgTbQkZcEqCpc3l3eUKWIBnqEU X-Gm-Message-State: AOJu0Yys6MeHBihIJ1KzVyElTGaUVMZvDWdflyi4jg0bk/K6EAa5b8/1 JjPflL16wYkbSZ9bOc0j4Oja4wyCghz01bnkwmeCVGOs5nE/l8HVEX/nFWSd7PWQS6WG61TMUlu YCg== X-Google-Smtp-Source: AGHT+IF9xs3HsjzFSBIAjqUyPXm38m51wM1HHA12Wsf9f2APNF16rnLMBv/VUvy/axmyL5EwvqJpcpdBut8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:b9a:b0:609:6719:5660 with SMTP id ck26-20020a05690c0b9a00b0060967195660mr3471394ywb.9.1709774028810; Wed, 06 Mar 2024 17:13:48 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 6 Mar 2024 17:13:42 -0800 In-Reply-To: <20240307011344.835640-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307011344.835640-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240307011344.835640-2-seanjc@google.com> Subject: [PATCH 1/3] KVM: VMX: Snapshot LBR capabilities during module initialization From: Sean Christopherson To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Mingwei Zhang , Jim Mattson Snapshot VMX's LBR capabilities once during module initialization instead of calling into perf every time a vCPU reconfigures its vPMU. This will allow massaging the LBR capabilities, e.g. if the CPU doesn't support callstacks, without having to remember to update multiple locations. Opportunistically tag vmx_get_perf_capabilities() with __init, as it's only called from vmx_set_cpu_caps(). Signed-off-by: Sean Christopherson Reviewed-by: Mingwei Zhang --- arch/x86/kvm/vmx/pmu_intel.c | 2 +- arch/x86/kvm/vmx/vmx.c | 9 +++++---- arch/x86/kvm/vmx/vmx.h | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 12ade343a17e..be40474de6e4 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -535,7 +535,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) perf_capabilities = vcpu_get_perf_capabilities(vcpu); if (cpuid_model_is_consistent(vcpu) && (perf_capabilities & PMU_CAP_LBR_FMT)) - x86_perf_get_lbr(&lbr_desc->records); + memcpy(&lbr_desc->records, &vmx_lbr_caps, sizeof(vmx_lbr_caps)); else lbr_desc->records.nr = 0; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 7a74388f9ecf..2a7cd66988a5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -217,6 +217,8 @@ module_param(ple_window_max, uint, 0444); int __read_mostly pt_mode = PT_MODE_SYSTEM; module_param(pt_mode, int, S_IRUGO); +struct x86_pmu_lbr __ro_after_init vmx_lbr_caps; + static DEFINE_STATIC_KEY_FALSE(vmx_l1d_should_flush); static DEFINE_STATIC_KEY_FALSE(vmx_l1d_flush_cond); static DEFINE_MUTEX(vmx_l1d_flush_mutex); @@ -7844,10 +7846,9 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vmx_update_exception_bitmap(vcpu); } -static u64 vmx_get_perf_capabilities(void) +static __init u64 vmx_get_perf_capabilities(void) { u64 perf_cap = PMU_CAP_FW_WRITES; - struct x86_pmu_lbr lbr; u64 host_perf_cap = 0; if (!enable_pmu) @@ -7857,8 +7858,8 @@ static u64 vmx_get_perf_capabilities(void) rdmsrl(MSR_IA32_PERF_CAPABILITIES, host_perf_cap); if (!cpu_feature_enabled(X86_FEATURE_ARCH_LBR)) { - x86_perf_get_lbr(&lbr); - if (lbr.nr) + x86_perf_get_lbr(&vmx_lbr_caps); + if (vmx_lbr_caps.nr) perf_cap |= host_perf_cap & PMU_CAP_LBR_FMT; } diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index 65786dbe7d60..cc10df53966e 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h @@ -109,6 +109,8 @@ struct lbr_desc { bool msr_passthrough; }; +extern struct x86_pmu_lbr vmx_lbr_caps; + /* * The nested_vmx structure is part of vcpu_vmx, and holds information we need * for correct emulation of VMX (i.e., nested VMX) on this vcpu. From patchwork Thu Mar 7 01:13:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13584946 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E89748A for ; Thu, 7 Mar 2024 01:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774033; cv=none; b=PQdwIyMjY3YHUAnROX+AbaDWrHU+O+HBFhlJxczOe+OlU2J4nOe/Ti5f7lv5SP2iicAtSMgDAMUs7V7LzTgQOJY9hXxfXF4FtkZB4jV58SIwLmF3E6AG/DFRdGDn7fcmpxqWjaS1cBzBHhWqLNn/zumVOSinlNdujjzURmHc3NE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774033; c=relaxed/simple; bh=pDYlO6655RQWWCS62vtsbuYOY+fbm6Nz4LPdmuV/H+M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g7aoQnNyz168n8BYxbbXR2KnPD/ryxT/Tbe5iAHQovY6eyt8kQY8T2MywzHxs58tPitQP9Ezl3vfYRX+qbTlkrkIklgM3omb2nWMrJbDeqvw4VLxl+qOdja6FT7VgYfI7Hq7mH70XfJ3hm/iY1PP62ET4mkxLJx8DfJH9nU4pZo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HxaFGzxn; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HxaFGzxn" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-5dcbb769a71so361908a12.3 for ; Wed, 06 Mar 2024 17:13:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709774030; x=1710378830; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=URdnb8no/gejybKx7VpZ/WZV3Jy5gWivUnugYsUgOO8=; b=HxaFGzxneQWmKhHlBPb3/ZGmN8weGbFF+vRusrGdXoi+BN9wZ6aMUk6zH5avbOpg5K jGYyQAtvJOs0ddJUG7Shxg4LAjXU07jE1GU9JZw04SyRSCyLuxlZ8zJNsd6oareD+t5D 9/sTof9JyzIoYm1co0jxgyg88QA17kLEAnkdd2YpmdpzEA4Iva4AwOaaJucMn+amknHA XVFJSH8g/mbqKQ7bw/IrPHl/bY2oe17FbqQJ+micIJGEEwrGPXv2zOtGgDmyLTOHQzcr UFhT5/xDAIBxCz0lzvOMQe1rHXr20XftgZ2uObJGKiCf28K48olJTweeEokfl0q6jOpe /sYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709774030; x=1710378830; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=URdnb8no/gejybKx7VpZ/WZV3Jy5gWivUnugYsUgOO8=; b=YUBMzIgxwjL91QCNTsOcpls3cofTnWhKDv2PqY4MGNi0/L3FtN/Y+i7/6Q6w2C+I3v PCvuXlIcnWy2kXknnNl84QLEWN7XVBwR1l6W50KRsaEKV02CTEaG4i2QsqePPxmjWEcJ TqJv8FRBk1IbO8ioIi5WyiX23GV/lKVhmMWIN1iXcvIvyrnSAu9uFRQjXIfdbmPwull0 6J6+o3GFGHVn9+KzEH4wpe0Jk99fjbMEUQk9cuj6FKdoCRKvpe0RRoZyUUQNtyy7yrWx XWV8xRovFBxaetC/37KnnheihCkxh9s+zOHIUpNM+LFsdVvltKyxpe9iJUtN6Tjx9F+n MeEQ== X-Forwarded-Encrypted: i=1; AJvYcCUF3Q8UlQmxeAa5Lcfxs4O7/FBrJueij634+mfgwsOZlvNafzkvXTKE4/XIsYxwrrTWc8R8zesHIY1tX69FnMCTsclz X-Gm-Message-State: AOJu0YwE/aPukt4jNYUKhGfICIV/ZM56P2G1lIvV0/1F5saYsvl2aGp6 4PuaIv0/+kkhZtw8kZg9JlwsZYIICaRTmFvwIub9nYcrNAFV269wFJXopeRdIwe2pFCQXnT8wrr mUQ== X-Google-Smtp-Source: AGHT+IHE3hLUtN9mAa6biOVT2TlEtSXabGraYG0Zvf7THAU106ApQjXZwsK1IkK5O6pSCZp8GdlGKQw1rTY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a02:f87:b0:5e4:292b:d0eb with SMTP id dq7-20020a056a020f8700b005e4292bd0ebmr39689pgb.2.1709774030473; Wed, 06 Mar 2024 17:13:50 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 6 Mar 2024 17:13:43 -0800 In-Reply-To: <20240307011344.835640-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307011344.835640-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240307011344.835640-3-seanjc@google.com> Subject: [PATCH 2/3] perf/x86/intel: Expose existence of callback support to KVM From: Sean Christopherson To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Mingwei Zhang , Jim Mattson Add a "has_callstack" field to the x86_pmu_lbr structure used to pass information to KVM, and set it accordingly in x86_perf_get_lbr(). KVM will use has_callstack to avoid trying to create perf LBR events with PERF_SAMPLE_BRANCH_CALL_STACK on CPUs that don't support callstacks. Signed-off-by: Sean Christopherson Reviewed-by: Mingwei Zhang --- arch/x86/events/intel/lbr.c | 1 + arch/x86/include/asm/perf_event.h | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 78cd5084104e..4367aa77cb8d 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -1693,6 +1693,7 @@ void x86_perf_get_lbr(struct x86_pmu_lbr *lbr) lbr->from = x86_pmu.lbr_from; lbr->to = x86_pmu.lbr_to; lbr->info = x86_pmu.lbr_info; + lbr->has_callstack = x86_pmu_has_lbr_callstack(); } EXPORT_SYMBOL_GPL(x86_perf_get_lbr); diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 3736b8a46c04..7f1e17250546 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -555,6 +555,7 @@ struct x86_pmu_lbr { unsigned int from; unsigned int to; unsigned int info; + bool has_callstack; }; extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap); From patchwork Thu Mar 7 01:13:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13584947 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 438ECEACE for ; Thu, 7 Mar 2024 01:13:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774035; cv=none; b=LPxflt7nnXfc6yoFvRhWlTgP0JK4w+ylvD+tmnwR4nJqX20gtc+Eyo0Hfgyg+ZKDGkXY9OOYJEuBcoL0eVr/A28BuhICiG6s/C/jN2dYr+CwbQcXKIvypZGAvyaBM58Y3jAyeQgnkvXHzKQ2U0nS0ROXf18QEKda1mFsZwSHA7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774035; c=relaxed/simple; bh=pcz2Ucn1DKGCTxS7gDvUH85jIc5cUh+bswUIUHMbqQs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WTQw/QYijXa/jBhhcLXlUDj0kiWFjLn90bdSHGD6V/Wv94ayqD+M8C+kQjjHOrG4s2ddFyTLCKZHsv+bqE5Xyf/jSdIP703/RRZ8O7SrCeWT3IRYaGJGagTTVuGsGFysIi+BLTMvoGn9eayaftjSuqIrOYGGXloXYJ7ksm0AfSw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1ioaFdpy; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1ioaFdpy" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6b26eef6cso487422276.3 for ; Wed, 06 Mar 2024 17:13:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709774032; x=1710378832; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=o3SxNJAQq8uZUj+l9JJTY3oE5/SJJ0Uc20+Uo+WJGNo=; b=1ioaFdpyZxEXxdv2HY6mKQNHhCecMQVUURH7MuC7VO+LPCuF9+8i94oRIK3eTrXoJV sOdjhtccLwZju1iiiCWcjpWcsoabmFaXEo5IcCI0DFAxk5S6LXxbdnkZLGsHO6PNo1sB kOfqFuXt93LvkTr+7k+n+hK61KJPwxy6FGVWjwrrPdB79LTf51R7tvkhdZZ0xuWzVXv3 qKvqU1h9Wolr2T+k+ESJVW+JWrb8M/qWyBMRtuMNV3YawIKOPyZGn4bTN3kicMJpyq8j F5zuz0K1XHPlJfM8uq45LVP2WwUxfDi8s6CUVldXvkW17yyTefnIi8D7e2a1opOOb9yM b1Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709774032; x=1710378832; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o3SxNJAQq8uZUj+l9JJTY3oE5/SJJ0Uc20+Uo+WJGNo=; b=h8IcqfTapeAkmJHjmboCv6BtjqGoELti419GjKpnSJV5+M7KeTTyQi7nLAvMZOy0TV Y/S4c42puzyWbzEnvqiKvRdVAHCrkI0RzExMnggAqODgVVWcJcBf3e2Dhq9kKSi0/LDB jMdu9v9QWPG9P4jx1Il3FSV+23RnJKqY//7t0tZAe6Tpr2GflNfEyLSx2AudXYImnzZf 8hZNAWp0LzkMRJG8hOUMWRjaHtVCrltTPEIeOJtsgGUnsRaqAxqd51wj3Dk705lK+jVF WWjYLE0ysqFb7yAEnURBy1pQYpZ2e3Rq2hyGbd5EOWZea1aW1sGCpqdXty9F+SdOLp7X oXoQ== X-Forwarded-Encrypted: i=1; AJvYcCXRkGTc3ewTfTmsIEw1rr7knjkO4GVRx+zLWCZdzZmPZjKWVSt02C8Y2Y0nUqyuhGU9g2BMkaX+CX+WIpeZDzjl6zQJ X-Gm-Message-State: AOJu0YybvolaWSR6G6pdp2/CJGAab2UD7U2wDJPuQ5qP9gE+w5doTqlv 5TpN56W3KpddXOZiTCLu/aWCZL6qR/DB8H0uj8NfMLcjouEx02Pp/XvQ6ShlfTfhCSlALoCQMNr xcQ== X-Google-Smtp-Source: AGHT+IGeL/DjPRgCNBVl+V/SB3gCWNCNZ4LpSUf0yDvzT/PpyTaaBz/Gs5dkdOT3yZ6PloXBBo6wJVf66G8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:aaa3:0:b0:dc6:db9b:7a6d with SMTP id t32-20020a25aaa3000000b00dc6db9b7a6dmr665270ybi.13.1709774032394; Wed, 06 Mar 2024 17:13:52 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 6 Mar 2024 17:13:44 -0800 In-Reply-To: <20240307011344.835640-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307011344.835640-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240307011344.835640-4-seanjc@google.com> Subject: [PATCH 3/3] KVM: VMX: Disable LBR virtualization if the CPU doesn't support LBR callstacks From: Sean Christopherson To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Mingwei Zhang , Jim Mattson Disable LBR virtualization if the CPU doesn't support callstacks, which were introduced in HSW (see commit e9d7f7cd97c4 ("perf/x86/intel: Add basic Haswell LBR call stack support"), as KVM unconditionally configures the perf LBR event with PERF_SAMPLE_BRANCH_CALL_STACK, i.e. LBR virtualization always fails on pre-HSW CPUs. Simply disable LBR support on such CPUs, as it has never worked, i.e. there is no risk of breaking an existing setup, and figuring out a way to performantly context switch LBRs on old CPUs is not worth the effort. Fixes: be635e34c284 ("KVM: vmx/pmu: Expose LBR_FMT in the MSR_IA32_PERF_CAPABILITIES") Cc: Mingwei Zhang Cc: Jim Mattson Signed-off-by: Sean Christopherson Tested-by: Mingwei Zhang --- arch/x86/kvm/vmx/vmx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 2a7cd66988a5..25a7652bee7c 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7859,7 +7859,15 @@ static __init u64 vmx_get_perf_capabilities(void) if (!cpu_feature_enabled(X86_FEATURE_ARCH_LBR)) { x86_perf_get_lbr(&vmx_lbr_caps); - if (vmx_lbr_caps.nr) + + /* + * KVM requires LBR callstack support, as the overhead due to + * context switching LBRs without said support is too high. + * See intel_pmu_create_guest_lbr_event() for more info. + */ + if (!vmx_lbr_caps.has_callstack) + memset(&vmx_lbr_caps, 0, sizeof(vmx_lbr_caps)); + else if (vmx_lbr_caps.nr) perf_cap |= host_perf_cap & PMU_CAP_LBR_FMT; }