From: Jinrong Liang <ljr.kernel@gmail.com>
To: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Like Xu <likexu@tencent.com>,
Jim Mattson <jmattson@google.com>,
Aaron Lewis <aaronlewis@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jinrong Liang <cloudliang@tencent.com>,
Jinrong Liang <ljr.kernel@gmail.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/9] KVM: selftests: Test AMD PMU performance counters basic functions
Date: Tue, 21 Nov 2023 19:54:53 +0800 [thread overview]
Message-ID: <20231121115457.76269-6-cloudliang@tencent.com> (raw)
In-Reply-To: <20231121115457.76269-1-cloudliang@tencent.com>
From: Jinrong Liang <cloudliang@tencent.com>
Add tests to check AMD PMU performance counters basic functions.
Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
---
.../selftests/kvm/x86_64/pmu_counters_test.c | 84 +++++++++++++++++--
1 file changed, 75 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
index efd8c61e1c16..3c4081a508b0 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
@@ -21,6 +21,8 @@
#define NUM_INSNS_RETIRED (NUM_BRANCHES + NUM_EXTRA_INSNS)
#define PMI_VECTOR 0x20
+#define AMD64_NR_COUNTERS 4
+#define AMD64_NR_COUNTERS_CORE 6
static uint8_t kvm_pmu_version;
static bool kvm_has_perf_caps;
@@ -411,7 +413,6 @@ static void guest_rd_wr_counters(uint32_t base_msr, uint8_t nr_possible_counters
rdpmc_idx = i;
if (base_msr == MSR_CORE_PERF_FIXED_CTR0)
rdpmc_idx |= INTEL_RDPMC_FIXED;
-
guest_test_rdpmc(rdpmc_idx, expect_success, expected_val);
/*
@@ -421,7 +422,6 @@ static void guest_rd_wr_counters(uint32_t base_msr, uint8_t nr_possible_counters
*/
GUEST_ASSERT(!expect_success || !pmu_has_fast_mode);
rdpmc_idx |= INTEL_RDPMC_FAST;
-
guest_test_rdpmc(rdpmc_idx, false, -1ull);
vector = wrmsr_safe(msr, 0);
@@ -701,19 +701,85 @@ static void test_intel_counters(void)
}
}
+static void set_amd_counters(uint8_t *nr_amd_ounters, uint64_t *ctrl_msr,
+ uint32_t *pmc_msr, uint8_t *flag)
+{
+ if (this_cpu_has(X86_FEATURE_PERFMON_V2)) {
+ *nr_amd_ounters = this_cpu_property(X86_PROPERTY_PMU_NR_CORE_COUNTERS);
+ *ctrl_msr = MSR_F15H_PERF_CTL0;
+ *pmc_msr = MSR_F15H_PERF_CTR0;
+ *flag = 2;
+ } else if (this_cpu_has(X86_FEATURE_PERFCTR_CORE)) {
+ *nr_amd_ounters = AMD64_NR_COUNTERS_CORE;
+ *ctrl_msr = MSR_F15H_PERF_CTL0;
+ *pmc_msr = MSR_F15H_PERF_CTR0;
+ *flag = 2;
+ } else {
+ *nr_amd_ounters = AMD64_NR_COUNTERS;
+ *ctrl_msr = MSR_K7_EVNTSEL0;
+ *pmc_msr = MSR_K7_PERFCTR0;
+ *flag = 1;
+ }
+}
+
+static void guest_test_amd_counters(void)
+{
+ bool guest_pmu_is_perfmonv2 = this_cpu_has(X86_FEATURE_PERFMON_V2);
+ uint8_t nr_amd_counters, flag;
+ uint64_t ctrl_msr;
+ unsigned int i, j;
+ uint32_t pmc_msr;
+
+ set_amd_counters(&nr_amd_counters, &ctrl_msr, &pmc_msr, &flag);
+
+ for (i = 0; i < nr_amd_counters; i++) {
+ for (j = 0; j < NR_AMD_ZEN_EVENTS; j++) {
+ wrmsr(pmc_msr + i * flag, 0);
+ wrmsr(ctrl_msr + i * flag, ARCH_PERFMON_EVENTSEL_OS |
+ ARCH_PERFMON_EVENTSEL_ENABLE | amd_pmu_zen_events[j]);
+
+ if (guest_pmu_is_perfmonv2)
+ wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, BIT_ULL(i));
+
+ __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES}));
+
+ GUEST_ASSERT(rdmsr(pmc_msr + i * flag));
+ }
+ }
+
+ GUEST_DONE();
+}
+
+static void test_amd_zen_events(void)
+{
+ struct kvm_vcpu *vcpu;
+ struct kvm_vm *vm;
+
+ vm = pmu_vm_create_with_one_vcpu(&vcpu, guest_test_amd_counters);
+
+ run_vcpu(vcpu);
+ kvm_vm_free(vm);
+}
+
int main(int argc, char *argv[])
{
TEST_REQUIRE(kvm_is_pmu_enabled());
- TEST_REQUIRE(host_cpu_is_intel);
- TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION));
- TEST_REQUIRE(kvm_cpu_property(X86_PROPERTY_PMU_VERSION) > 0);
+ if (host_cpu_is_intel) {
+ TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION));
+ TEST_REQUIRE(kvm_cpu_property(X86_PROPERTY_PMU_VERSION) > 0);
+ TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_PDCM));
- kvm_pmu_version = kvm_cpu_property(X86_PROPERTY_PMU_VERSION);
- kvm_has_perf_caps = kvm_cpu_has(X86_FEATURE_PDCM);
- is_forced_emulation_enabled = kvm_is_forced_emulation_enabled();
+ kvm_pmu_version = kvm_cpu_property(X86_PROPERTY_PMU_VERSION);
+ kvm_has_perf_caps = kvm_cpu_has(X86_FEATURE_PDCM);
+ is_forced_emulation_enabled = kvm_is_forced_emulation_enabled();
- test_intel_counters();
+ test_intel_counters();
+ } else if (host_cpu_is_amd) {
+ test_amd_zen_events();
+ } else {
+ TEST_FAIL("Unknown CPU vendor");
+ }
return 0;
}
--
2.39.3
next prev parent reply other threads:[~2023-11-21 11:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 11:54 [PATCH 0/9] Test the consistency of AMD PMU counters and their features Jinrong Liang
2023-11-21 11:54 ` [PATCH 1/9] KVM: selftests: Add forced emulation check to fix #UD Jinrong Liang
2023-11-21 11:54 ` [PATCH 2/9] KVM: selftests: Test gp counters overflow interrupt handling Jinrong Liang
2023-11-21 11:54 ` [PATCH 3/9] KVM: selftests: Test fixed " Jinrong Liang
2023-11-21 11:54 ` [PATCH 4/9] KVM: selftests: Add x86 feature and properties for AMD PMU in processor.h Jinrong Liang
2023-11-21 11:54 ` Jinrong Liang [this message]
2023-11-21 11:54 ` [PATCH 6/9] KVM: selftests: Test consistency of AMD PMU counters num Jinrong Liang
2023-11-21 11:54 ` [PATCH 7/9] KVM: selftests: Test consistency of PMU MSRs with AMD PMU version Jinrong Liang
2023-11-21 11:54 ` [PATCH 8/9] KVM: selftests: Test AMD Guest PerfCtrExtCore Jinrong Liang
2023-11-21 11:54 ` [PATCH 9/9] KVM: selftests: Test AMD Guest PerfMonV2 Jinrong Liang
2024-06-10 23:36 ` [PATCH 0/9] Test the consistency of AMD PMU counters and their features Colton Lewis
2024-06-11 3:48 ` 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=20231121115457.76269-6-cloudliang@tencent.com \
--to=ljr.kernel@gmail.com \
--cc=aaronlewis@google.com \
--cc=cloudliang@tencent.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=likexu@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=wanpengli@tencent.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;
as well as URLs for NNTP newsgroup(s).