KVM: selftests: Add a helper to query if the PMU module param is enabled

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>
Tested-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://lore.kernel.org/r/20240109230250.424295-23-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index 92d4f8ecc7308b8c9b656119ab0ebf78eb338c92..ee082ae58f404546a8db62e0305e146af05145ea 100644 (file)
--- 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 4c7133ddcda8d5a1cf2e6cdf50d532fde3f65be9..9e9dc4084c0d98b7746c6a9109e1280ac7e9264c 100644 (file)
--- 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 7ec9fbed92e0719a2a4d94e4f136c4ad614fd5c2..fa407e2ccb2f7413711b9a0f90984c470734b350 100644 (file)
--- 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 2a8d4ac2f0204780498dd42b6343deb5fbb04c9b..8ded194c5a6d2c53365211501127af81deb69bc5 100644 (file)
--- 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));