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 v10 20/29] KVM: selftests: Add functional test for Intel's fixed PMU counters
Date: Tue, 9 Jan 2024 15:02:40 -0800 [thread overview]
Message-ID: <20240109230250.424295-21-seanjc@google.com> (raw)
In-Reply-To: <20240109230250.424295-1-seanjc@google.com>
From: Jinrong Liang <cloudliang@tencent.com>
Extend the fixed counters test to verify that supported counters can
actually be enabled in the control MSRs, that unsupported counters cannot,
and that enabled counters actually count.
Co-developed-by: Like Xu <likexu@tencent.com>
Signed-off-by: Like Xu <likexu@tencent.com>
Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
[sean: fold into the rd/wr access test, massage changelog]
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
.../selftests/kvm/x86_64/pmu_counters_test.c | 31 ++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
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 b07294af71a3..f5dedd112471 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
@@ -332,7 +332,6 @@ static void guest_rd_wr_counters(uint32_t base_msr, uint8_t nr_possible_counters
vector = wrmsr_safe(msr, 0);
GUEST_ASSERT_PMC_MSR_ACCESS(WRMSR, msr, expect_gp, vector);
}
- GUEST_DONE();
}
static void guest_test_gp_counters(void)
@@ -350,6 +349,7 @@ static void guest_test_gp_counters(void)
base_msr = MSR_IA32_PERFCTR0;
guest_rd_wr_counters(base_msr, MAX_NR_GP_COUNTERS, nr_gp_counters, 0);
+ GUEST_DONE();
}
static void test_gp_counters(uint8_t pmu_version, uint64_t perf_capabilities,
@@ -373,6 +373,7 @@ static void guest_test_fixed_counters(void)
{
uint64_t supported_bitmask = 0;
uint8_t nr_fixed_counters = 0;
+ uint8_t i;
/* Fixed counters require Architectural vPMU Version 2+. */
if (guest_get_pmu_version() >= 2)
@@ -387,6 +388,34 @@ static void guest_test_fixed_counters(void)
guest_rd_wr_counters(MSR_CORE_PERF_FIXED_CTR0, MAX_NR_FIXED_COUNTERS,
nr_fixed_counters, supported_bitmask);
+
+ for (i = 0; i < MAX_NR_FIXED_COUNTERS; i++) {
+ uint8_t vector;
+ uint64_t val;
+
+ if (i >= nr_fixed_counters && !(supported_bitmask & BIT_ULL(i))) {
+ vector = wrmsr_safe(MSR_CORE_PERF_FIXED_CTR_CTRL,
+ FIXED_PMC_CTRL(i, FIXED_PMC_KERNEL));
+ __GUEST_ASSERT(vector == GP_VECTOR,
+ "Expected #GP for counter %u in FIXED_CTR_CTRL", i);
+
+ vector = wrmsr_safe(MSR_CORE_PERF_GLOBAL_CTRL,
+ FIXED_PMC_GLOBAL_CTRL_ENABLE(i));
+ __GUEST_ASSERT(vector == GP_VECTOR,
+ "Expected #GP for counter %u in PERF_GLOBAL_CTRL", i);
+ continue;
+ }
+
+ wrmsr(MSR_CORE_PERF_FIXED_CTR0 + i, 0);
+ wrmsr(MSR_CORE_PERF_FIXED_CTR_CTRL, FIXED_PMC_CTRL(i, FIXED_PMC_KERNEL));
+ wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, FIXED_PMC_GLOBAL_CTRL_ENABLE(i));
+ __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES}));
+ wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, 0);
+ val = rdmsr(MSR_CORE_PERF_FIXED_CTR0 + i);
+
+ GUEST_ASSERT_NE(val, 0);
+ }
+ GUEST_DONE();
}
static void test_fixed_counters(uint8_t pmu_version, uint64_t perf_capabilities,
--
2.43.0.472.g3155946c3a-goog
next prev parent reply other threads:[~2024-01-09 23:03 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 23:02 [PATCH v10 00/29] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 01/29] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 02/29] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 03/29] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 04/29] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 05/29] KVM: x86/pmu: Get eventsel for fixed counters from perf Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 06/29] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 07/29] KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad index Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 08/29] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 09/29] KVM: x86/pmu: Disallow "fast" RDPMC for architectural " Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 10/29] KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not flag Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 11/29] KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC types Sean Christopherson
2024-01-12 3:50 ` Mi, Dapeng
2024-01-09 23:02 ` [PATCH v10 12/29] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 13/29] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 14/29] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 15/29] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2024-01-10 9:21 ` Andrew Jones
2024-01-10 13:58 ` Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 16/29] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2024-01-12 9:14 ` Mi, Dapeng
2024-01-12 21:37 ` Sean Christopherson
2024-01-15 2:03 ` Mi, Dapeng
2024-01-30 23:27 ` Sean Christopherson
2024-01-31 2:11 ` Mi, Dapeng
2024-01-31 15:31 ` Sean Christopherson
2024-02-01 1:51 ` Mi, Dapeng
2024-01-09 23:02 ` [PATCH v10 17/29] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 18/29] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 19/29] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2024-01-09 23:02 ` Sean Christopherson [this message]
2024-01-09 23:02 ` [PATCH v10 21/29] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 22/29] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 23/29] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 24/29] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 25/29] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 26/29] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 27/29] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 28/29] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2024-01-09 23:02 ` [PATCH v10 29/29] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
2024-01-12 9:17 ` [PATCH v10 00/29] KVM: x86/pmu: selftests: Fixes and new tests Mi, Dapeng
2024-01-31 0:59 ` Sean Christopherson
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=20240109230250.424295-21-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