From: Yang Weijiang <weijiang.yang@intel.com>
To: pbonzini@redhat.com, jmattson@google.com, seanjc@google.com,
like.xu.linux@gmail.com, vkuznets@redhat.com,
wei.w.wang@intel.com, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Like Xu <like.xu@linux.intel.com>,
Yang Weijiang <weijiang.yang@intel.com>
Subject: [PATCH v9 07/17] KVM: vmx/pmu: Emulate MSR_ARCH_LBR_DEPTH for guest Arch LBR
Date: Tue, 15 Feb 2022 16:25:34 -0500 [thread overview]
Message-ID: <20220215212544.51666-8-weijiang.yang@intel.com> (raw)
In-Reply-To: <20220215212544.51666-1-weijiang.yang@intel.com>
From: Like Xu <like.xu@linux.intel.com>
The number of Arch LBR entries available is determined by the value
in host MSR_ARCH_LBR_DEPTH.DEPTH. The supported LBR depth values are
enumerated in CPUID.(EAX=01CH, ECX=0):EAX[7:0]. For each bit "n" set
in this field, the MSR_ARCH_LBR_DEPTH.DEPTH value of "8*(n+1)" is
supported. In the first generation of Arch LBR, max entry size is 32,
host configures the max size and guest always honors the setting.
Write to MSR_ARCH_LBR_DEPTH has side-effect, all LBR entries are reset
to 0. Kernel PMU driver can leverage this effect to do fask reset to
LBR record MSRs. KVM allows guest to achieve it when Arch LBR records
MSRs are passed through to the guest.
Signed-off-by: Like Xu <like.xu@linux.intel.com>
Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
---
arch/x86/include/asm/kvm_host.h | 3 +++
arch/x86/kvm/vmx/pmu_intel.c | 48 ++++++++++++++++++++++++++++++++-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 0c3a6feb41eb..8e1547d4747c 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -528,6 +528,9 @@ struct kvm_pmu {
* redundant check before cleanup if guest don't use vPMU at all.
*/
u8 event_count;
+
+ /* Guest arch lbr depth supported by KVM. */
+ u64 kvm_arch_lbr_depth;
};
struct kvm_pmu_ops;
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index 466d18fc0c5d..cbf00db5448a 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -205,7 +205,7 @@ static bool intel_pmu_is_valid_lbr_msr(struct kvm_vcpu *vcpu, u32 index)
static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)
{
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
- int ret;
+ int ret = 0;
switch (msr) {
case MSR_CORE_PERF_FIXED_CTR_CTRL:
@@ -214,6 +214,10 @@ static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)
case MSR_CORE_PERF_GLOBAL_OVF_CTRL:
ret = pmu->version > 1;
break;
+ case MSR_ARCH_LBR_DEPTH:
+ if (kvm_cpu_cap_has(X86_FEATURE_ARCH_LBR))
+ ret = guest_cpuid_has(vcpu, X86_FEATURE_ARCH_LBR);
+ break;
default:
ret = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0) ||
get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0) ||
@@ -342,10 +346,26 @@ static bool intel_pmu_handle_lbr_msrs_access(struct kvm_vcpu *vcpu,
return true;
}
+/*
+ * Check if the requested depth value the same as that of host.
+ * When guest/host depth are different, the handling would be tricky,
+ * so now only max depth is supported for both host and guest.
+ */
+static bool arch_lbr_depth_is_valid(struct kvm_vcpu *vcpu, u64 depth)
+{
+ struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
+
+ if (!kvm_cpu_cap_has(X86_FEATURE_ARCH_LBR))
+ return false;
+
+ return (depth == pmu->kvm_arch_lbr_depth);
+}
+
static int intel_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
{
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
struct kvm_pmc *pmc;
+ struct lbr_desc *lbr_desc = vcpu_to_lbr_desc(vcpu);
u32 msr = msr_info->index;
switch (msr) {
@@ -361,6 +381,9 @@ static int intel_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
case MSR_CORE_PERF_GLOBAL_OVF_CTRL:
msr_info->data = 0;
return 0;
+ case MSR_ARCH_LBR_DEPTH:
+ msr_info->data = lbr_desc->records.nr;
+ return 0;
default:
if ((pmc = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0)) ||
(pmc = get_gp_pmc(pmu, msr, MSR_IA32_PMC0))) {
@@ -387,6 +410,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
{
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
struct kvm_pmc *pmc;
+ struct lbr_desc *lbr_desc = vcpu_to_lbr_desc(vcpu);
u32 msr = msr_info->index;
u64 data = msr_info->data;
@@ -420,6 +444,16 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
return 0;
}
break;
+ case MSR_ARCH_LBR_DEPTH:
+ if (!arch_lbr_depth_is_valid(vcpu, data))
+ return 1;
+ lbr_desc->records.nr = data;
+ /*
+ * Writing depth MSR from guest could either setting the
+ * MSR or resetting the LBR records with the side-effect.
+ */
+ wrmsrl(MSR_ARCH_LBR_DEPTH, lbr_desc->records.nr);
+ return 0;
default:
if ((pmc = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0)) ||
(pmc = get_gp_pmc(pmu, msr, MSR_IA32_PMC0))) {
@@ -550,6 +584,18 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
if (lbr_desc->records.nr)
bitmap_set(pmu->all_valid_pmc_idx, INTEL_PMC_IDX_FIXED_VLBR, 1);
+
+ if (!kvm_cpu_cap_has(X86_FEATURE_ARCH_LBR))
+ return;
+
+ entry = kvm_find_cpuid_entry(vcpu, 28, 0);
+ if (entry) {
+ /*
+ * The depth mask in CPUID is fixed to host supported
+ * value when userspace sets guest CPUID.
+ */
+ pmu->kvm_arch_lbr_depth = fls(entry->eax & 0xff) * 8;
+ }
}
static void intel_pmu_init(struct kvm_vcpu *vcpu)
--
2.27.0
next prev parent reply other threads:[~2022-02-16 10:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 21:25 [PATCH v9 00/17] Introduce Architectural LBR for vPMU Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 01/17] KVM: x86: Report XSS as an MSR to be saved if there are supported features Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 02/17] KVM: x86: Refresh CPUID on writes to MSR_IA32_XSS Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 03/17] KVM: x86: Load guest fpu state when accessing MSRs managed by XSAVES Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 04/17] perf/x86/intel: Fix the comment about guest LBR support on KVM Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 05/17] perf/x86/lbr: Simplify the exposure check for the LBR_INFO registers Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 06/17] KVM: x86: Add Arch LBR MSRs to msrs_to_save_all list Yang Weijiang
2022-02-15 21:25 ` Yang Weijiang [this message]
2022-02-15 21:25 ` [PATCH v9 08/17] KVM: vmx/pmu: Emulate MSR_ARCH_LBR_CTL for guest Arch LBR Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 09/17] KVM: x86/pmu: Refactor code to support " Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 10/17] KVM: x86: Refine the matching and clearing logic for supported_xss Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 11/17] KVM: x86: Add XSAVE Support for Architectural LBR Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 12/17] KVM: x86/vmx: Check Arch LBR config when return perf capabilities Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 13/17] KVM: nVMX: Add necessary Arch LBR settings for nested VM Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 14/17] KVM: x86/vmx: Clear Arch LBREn bit before inject #DB to guest Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 15/17] KVM: x86/vmx: Flip Arch LBREn bit on guest state change Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 16/17] KVM: x86: Add Arch LBR MSR access interface Yang Weijiang
2022-02-15 21:25 ` [PATCH v9 17/17] KVM: x86/cpuid: Advertise Arch LBR feature in CPUID Yang Weijiang
2022-02-21 6:11 ` [PATCH v9 00/17] Introduce Architectural LBR for vPMU Yang, Weijiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220215212544.51666-8-weijiang.yang@intel.com \
--to=weijiang.yang@intel.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=like.xu.linux@gmail.com \
--cc=like.xu@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--cc=wei.w.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox