Re: [PATCH v7 15/19] KVM: selftests: Add a helper to query if the PMU module param is enabled

Mi, Dapeng
2023-11-09T07:45:23Z

On 11/8/2023 8:31 AM, Sean Christopherson wrote:
> Add a helper to problem KVM's "enable_pmu" param, open coding strings in
> multiple places is just asking for a false negatives and/or runtime errors
> due to typos.
>
> 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 64aecb3dcf60..c261e0941dfe 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/processor.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
> @@ -1216,6 +1216,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 90381382c51f..d775cc7e8fab 100644
> --- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
> @@ -537,7 +537,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 ebbcb0a3f743..562b0152a122 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));
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>