KVM: selftests: Report enable_pmu module value when test is skipped
cover KVM: selftests: Report enable_pmu module value when test is skipped
Adequate info can help developers quickly distinguish whether the cause is a code flaw or a platform limitation when a test fails or is skipped, and this minor patch-set is doing a little work in that direction.
Base: kvm-x86/next
Like Xu (2):
KVM: selftests: Add a helper to read kvm boolean module parameters
KVM: selftests: Report enable_pmu module value when test is skipped
tools/testing/selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 1 + 3 files changed, 7 insertions(+)
Signature · 1 line
2.39.1
PATCH 1/2 KVM: selftests: Add a helper to read kvm boolean module parameters
From: Like Xu <[email protected]>
Add a helper function for reading kvm boolean module parameters values. No functional change intended.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ 2 files changed, 6 insertions(+)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -0
@@ -213,6 +213,7 @@ extern const struct vm_guest_mode_params vm_guest_mode_params[];int open_path_or_exit (const char *path,int flags);int open_kvm_dev_path_or_exit (void ); +bool get_kvm_param_bool (const char *param);bool get_kvm_intel_param_bool (const char *param);bool get_kvm_amd_param_bool (const char *param);
tools/testing/selftests/kvm/lib/kvm_util.c +5 -0
@@ -80,6 +80,11 @@ static bool get_module_param_bool(const char *module_name, const char *param)TEST_FAIL ("Unrecognized value '%c' for boolean module param" , value); } +bool get_kvm_param_bool (const char *param) +{ +return get_module_param_bool ("kvm" , param); +} +bool get_kvm_intel_param_bool (const char *param) {return get_module_param_bool ("kvm_intel" , param);
Signature · 1 line
2.39.1
PATCH 2/2 KVM: selftests: Report enable_pmu module value when test is skipped
In reply to Like XuFrom: Like Xu <[email protected]>
Running x86_64/pmu_event_filter_test with enable_pmu globally disabled will report the following skipping prompt:
1..0 # SKIP - Requirement not met: use_intel_pmu() || use_amd_pmu()
this can be confusing, so add a check on enable_pmu.
--- tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -0
@@ -771,6 +771,7 @@ int main(int argc, char *argv[])TEST_REQUIRE (kvm_has_cap (KVM_CAP_PMU_EVENT_FILTER ));TEST_REQUIRE (kvm_has_cap (KVM_CAP_PMU_EVENT_MASKED_EVENTS )); +TEST_REQUIRE (get_kvm_param_bool ("enable_pmu" ));TEST_REQUIRE (use_intel_pmu () ||use_amd_pmu ()); guest_code =use_intel_pmu () ? intel_guest_code : amd_guest_code;
Signature · 1 line
2.39.1
Sean Christopherson
reviewerQuoted 17 lines · Like Xu
From: Like Xu <[email protected]>
Running x86_64/pmu_event_filter_test with
enable_pmuglobally disabled will report the following skipping prompt:1..0 # SKIP - Requirement not met: use_intel_pmu() || use_amd_pmu()this can be confusing, so add a check on
enable_pmu.Signed-off-by Like Xu <[email protected]>--- tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 1 + 1 file changed, 1 insertion(+)tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +0
-0
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c int main(int argc, char *argv[]) · line 774
Quoted 4 lines
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1
-0@@ -771,6 +771,7 @@ int main(int argc, char *argv[])TEST_REQUIRE (kvm_has_cap (KVM_CAP_PMU_EVENT_FILTER ));TEST_REQUIRE (kvm_has_cap (KVM_CAP_PMU_EVENT_MASKED_EVENTS )); +TEST_REQUIRE (get_kvm_param_bool ("enable_pmu" ));
I think it makes sense to put this at the very top, just in case more requirements that depend on enable_pmu get added in the future. I can do that when applying.
I'll plan on grabbing this for 6.4.
Thanks!
Sean Christopherson
reviewerQuoted 11 lines · Like Xu
Adequate info can help developers quickly distinguish whether the cause is a code flaw or a platform limitation when a test fails or is skipped, and this minor patch-set is doing a little work in that direction.
Base: kvm-x86/next
Like Xu (2):
KVM: selftests: Add a helper to read kvm boolean module parameters
KVM: selftests: Reportenable_pmumodule value when test is skipped[...]
Applied to kvm-x86 selftests, thanks!
[1/2] KVM: selftests: Add a helper to read kvm boolean module parameters
https://github.com/kvm-x86/linux/commit/d14d9139c023 [2/2] KVM: selftests: Report enable_pmu module value when test is skipped https://github.com/kvm-x86/linux/commit/6cf332e8eca6
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes
Sean Christopherson
reviewerQuoted 11 lines · Sean Christopherson
Quoted 10 lines · Like Xu
Adequate info can help developers quickly distinguish whether the cause is a code flaw or a platform limitation when a test fails or is skipped, and this minor patch-set is doing a little work in that direction.
Base: kvm-x86/next
Like Xu (2):
KVM: selftests: Add a helper to read kvm boolean module parameters
KVM: selftests: Reportenable_pmumodule value when test is skipped
Quoted 8 lines
Quoted 1 line
[...]
Applied to kvm-x86 selftests, thanks!
[1/2] KVM: selftests: Add a helper to read kvm boolean module parameters
https://github.com/kvm-x86/linux/commit/d14d9139c023 [2/2] KVM: selftests: Report enable_pmu module value when test is skipped https://github.com/kvm-x86/linux/commit/6cf332e8eca6
Replaced patch 2 with your v2:
KVM: selftests: Report enable_pmu module value when test is skipped
https://github.com/kvm-x86/linux/commit/5b1abc285a08