From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Dapeng Mi <dapeng1.mi@linux.intel.com>,
Jim Mattson <jmattson@google.com>,
Jinrong Liang <cloudliang@tencent.com>,
Aaron Lewis <aaronlewis@google.com>,
Like Xu <likexu@tencent.com>
Subject: [PATCH v8 05/26] KVM: x86/pmu: Get eventsel for fixed counters from perf
Date: Thu, 9 Nov 2023 18:12:45 -0800 [thread overview]
Message-ID: <20231110021306.1269082-6-seanjc@google.com> (raw)
In-Reply-To: <20231110021306.1269082-1-seanjc@google.com>
Get the event selectors used to effectively request fixed counters for
perf events from perf itself instead of hardcoding them in KVM and hoping
that they match the underlying hardware. While fixed counters 0 and 1 use
architectural events, as of ffbe4ab0beda ("perf/x86/intel: Extend the
ref-cycles event to GP counters") fixed counter 2 (reference TSC cycles)
may use a software-defined pseudo-encoding or a real hardware-defined
encoding.
Reported-by: Kan Liang <kan.liang@linux.intel.com>
Closes: https://lkml.kernel.org/r/4281eee7-6423-4ec8-bb18-c6aeee1faf2c%40linux.intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/vmx/pmu_intel.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index c9df139efc0c..3bac3b32b485 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -406,24 +406,28 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
* result is the same (ignoring the fact that using a general purpose counter
* will likely exacerbate counter contention).
*
- * Note, reference cycles is counted using a perf-defined "psuedo-encoding",
- * as there is no architectural general purpose encoding for reference cycles.
+ * Forcibly inlined to allow asserting on @index at build time, and there should
+ * never be more than one user.
*/
-static u64 intel_get_fixed_pmc_eventsel(int index)
+static __always_inline u64 intel_get_fixed_pmc_eventsel(unsigned int index)
{
- const struct {
- u8 event;
- u8 unit_mask;
- } fixed_pmc_events[] = {
- [0] = { 0xc0, 0x00 }, /* Instruction Retired / PERF_COUNT_HW_INSTRUCTIONS. */
- [1] = { 0x3c, 0x00 }, /* CPU Cycles/ PERF_COUNT_HW_CPU_CYCLES. */
- [2] = { 0x00, 0x03 }, /* Reference Cycles / PERF_COUNT_HW_REF_CPU_CYCLES*/
+ const enum perf_hw_id fixed_pmc_perf_ids[] = {
+ [0] = PERF_COUNT_HW_INSTRUCTIONS,
+ [1] = PERF_COUNT_HW_CPU_CYCLES,
+ [2] = PERF_COUNT_HW_REF_CPU_CYCLES,
};
+ u64 eventsel;
- BUILD_BUG_ON(ARRAY_SIZE(fixed_pmc_events) != KVM_PMC_MAX_FIXED);
+ BUILD_BUG_ON(ARRAY_SIZE(fixed_pmc_perf_ids) != KVM_PMC_MAX_FIXED);
+ BUILD_BUG_ON(index >= KVM_PMC_MAX_FIXED);
- return (fixed_pmc_events[index].unit_mask << 8) |
- fixed_pmc_events[index].event;
+ /*
+ * Yell if perf reports support for a fixed counter but perf doesn't
+ * have a known encoding for the associated general purpose event.
+ */
+ eventsel = perf_get_hw_event_config(fixed_pmc_perf_ids[index]);
+ WARN_ON_ONCE(!eventsel && index < kvm_pmu_cap.num_counters_fixed);
+ return eventsel;
}
static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
--
2.42.0.869.gea05f2083d-goog
next prev parent reply other threads:[~2023-11-10 2:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 2:12 [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 01/26] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 02/26] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 03/26] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 04/26] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2023-11-10 2:12 ` Sean Christopherson [this message]
2023-11-10 13:48 ` [PATCH v8 05/26] KVM: x86/pmu: Get eventsel for fixed counters from perf Liang, Kan
2023-11-10 2:12 ` [PATCH v8 06/26] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 07/26] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs Sean Christopherson
2023-11-10 3:22 ` Mi, Dapeng
2023-11-10 14:51 ` Sean Christopherson
2023-11-13 1:24 ` Mi, Dapeng
2023-11-10 2:12 ` [PATCH v8 08/26] KVM: x86/pmu: Disallow "fast" RDPMC for architectural " Sean Christopherson
2023-11-10 6:07 ` Mi, Dapeng
2023-11-10 23:32 ` Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 09/26] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 10/26] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 11/26] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 12/26] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 13/26] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 14/26] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 15/26] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 16/26] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 17/26] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 18/26] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 19/26] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 20/26] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 21/26] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 22/26] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 23/26] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 24/26] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 25/26] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 26/26] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
2023-11-13 11:41 ` Jinrong Liang
2023-11-13 13:40 ` Sean Christopherson
2023-11-14 3:07 ` Jinrong Liang
2023-11-10 2:52 ` [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Jinrong Liang
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=20231110021306.1269082-6-seanjc@google.com \
--to=seanjc@google.com \
--cc=aaronlewis@google.com \
--cc=cloudliang@tencent.com \
--cc=dapeng1.mi@linux.intel.com \
--cc=jmattson@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=likexu@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.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