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 22/29] KVM: selftests: Add a helper to query if the PMU module param is enabled
Date: Tue, 9 Jan 2024 15:02:42 -0800 [thread overview]
Message-ID: <20240109230250.424295-23-seanjc@google.com> (raw)
In-Reply-To: <20240109230250.424295-1-seanjc@google.com>
Add a helper to probe KVM's "enable_pmu" param, open coding strings in
multiple places is just asking for false negatives and/or runtime errors
due to typos.
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
tools/testing/selftests/kvm/include/x86_64/processor.h | 5 +++++
tools/testing/selftests/kvm/x86_64/pmu_counters_test.c | 2 +-
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 2 +-
tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index 92d4f8ecc730..ee082ae58f40 100644
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -1217,6 +1217,11 @@ static inline uint8_t xsetbv_safe(uint32_t index, uint64_t value)
bool kvm_is_tdp_enabled(void);
+static inline bool kvm_is_pmu_enabled(void)
+{
+ return get_kvm_param_bool("enable_pmu");
+}
+
uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr,
int *level);
uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr);
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 4c7133ddcda8..9e9dc4084c0d 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
@@ -545,7 +545,7 @@ static void test_intel_counters(void)
int main(int argc, char *argv[])
{
- TEST_REQUIRE(get_kvm_param_bool("enable_pmu"));
+ TEST_REQUIRE(kvm_is_pmu_enabled());
TEST_REQUIRE(host_cpu_is_intel);
TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION));
diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
index 7ec9fbed92e0..fa407e2ccb2f 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
@@ -867,7 +867,7 @@ int main(int argc, char *argv[])
struct kvm_vcpu *vcpu, *vcpu2 = NULL;
struct kvm_vm *vm;
- TEST_REQUIRE(get_kvm_param_bool("enable_pmu"));
+ TEST_REQUIRE(kvm_is_pmu_enabled());
TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_FILTER));
TEST_REQUIRE(kvm_has_cap(KVM_CAP_PMU_EVENT_MASKED_EVENTS));
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
index 2a8d4ac2f020..8ded194c5a6d 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
{
union perf_capabilities host_cap;
- TEST_REQUIRE(get_kvm_param_bool("enable_pmu"));
+ TEST_REQUIRE(kvm_is_pmu_enabled());
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_PDCM));
TEST_REQUIRE(kvm_cpu_has_p(X86_PROPERTY_PMU_VERSION));
--
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 ` [PATCH v10 20/29] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
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 ` Sean Christopherson [this message]
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-23-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