x86: Skip perf related tests when platform cannot support
PATCH v4 1/2 x86: Skip perf related tests when platform cannot support
Add helpers to check whether MSR_CORE_PERF_GLOBAL_CTRL and rdpmc are supported in KVM. When pmu is disabled with enable_pmu=0, reading MSR_CORE_PERF_GLOBAL_CTRL or executing rdpmc leads to #GP, so skip related tests in this case to avoid test failure.
Opportunistically replace some "printf" with "report_skip" to make the output log clean.
v4:
- Use supported_fn() to make the code nicer. [Sean]
- Replace some of the printf with report_skip to make the results clean. [Sean]
--- lib/x86/processor.h | 10 ++++++++++ x86/vmx_tests.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 13 deletions(-)
lib/x86/processor.h +10 -0
@@ -690,4 +690,14 @@ static inline bool cpuid_osxsave(void) return cpuid(1).c & (1 << (X86_FEATURE_OSXSAVE % 32)); } +static inline u8 pmu_version (void ) +{ +return cpuid (10 ).a &0xff ; +} + +static inline bool cpu_has_perf_global_ctrl (void ) +{ +return pmu_version () >1 ; +} +#endif
x86/vmx_tests.c +27 -13
@@ -852,6 +852,10 @@ static bool monitor_supported(void)return this_cpu_has (X86_FEATURE_MWAIT ); } +static inline bool pmu_supported (void ) { +return !!pmu_version (); +} +struct insn_table {const char *name;u32 flag;
@@ -881,7 +885,7 @@ static struct insn_table insn_table[] = { {"INVLPG" ,CPU_INVLPG , insn_invlpg,INSN_CPU0 ,14 , 0x12345678, 0, FIELD_EXIT_QUAL}, {"MWAIT", CPU_MWAIT, insn_mwait, INSN_CPU0, 36, 0, 0, 0, &monitor_supported}, - {"RDPMC", CPU_RDPMC, insn_rdpmc, INSN_CPU0, 15, 0, 0, 0}, + {"RDPMC", CPU_RDPMC, insn_rdpmc, INSN_CPU0, 15, 0, 0, 0, &pmu_supported}, {"RDTSC", CPU_RDTSC, insn_rdtsc, INSN_CPU0, 16, 0, 0, 0}, {"CR3 load", CPU_CR3_LOAD, insn_cr3_load, INSN_CPU0, 28, 0x3, 0, FIELD_EXIT_QUAL},
@@ -4107,7 +4111,7 @@ static void test_vpid(void)int i;if (!is_vpid_supported ()) { -printf ("Secondary controls and/or VPID not supported\n" ); +report_skip ("Secondary controls and/or VPID not supported\n" );return ; }
@@ -4614,7 +4618,7 @@ static void test_nmi_ctrls(void)if ((ctrl_pin_rev.clr & (PIN_NMI |PIN_VIRT_NMI )) != (PIN_NMI |PIN_VIRT_NMI )) { -printf ("NMI exiting and Virtual NMIs are not supported !\n" ); +report_skip ("NMI exiting and Virtual NMIs are not supported !\n" );return ; }
@@ -4724,7 +4728,7 @@ static void test_ept_eptp(void)if (!((ctrl_cpu_rev[0 ].clr &CPU_SECONDARY ) && (ctrl_cpu_rev[1 ].clr &CPU_EPT ))) { -printf ("\"CPU secondary\" and/or \"enable EPT\" execution controls are not supported !\n" ); +report_skip ("\"CPU secondary\" and/or \"enable EPT\" execution controls are not supported !\n" );return ; }
@@ -4884,7 +4888,7 @@ static void test_pml(void)if (!((ctrl_cpu_rev[0 ].clr &CPU_SECONDARY ) && (ctrl_cpu_rev[1 ].clr &CPU_EPT ) && (ctrl_cpu_rev[1 ].clr &CPU_PML ))) { -printf ("\"Secondary execution\" control or \"enable EPT\" control or \"enable PML\" control is not supported !\n" ); +report_skip ("\"Secondary execution\" control or \"enable EPT\" control or \"enable PML\" control is not supported !\n" );return ; }
@@ -4936,7 +4940,7 @@ static void test_vmx_preemption_timer(void)if (!((ctrl_exit_rev.clr &EXI_SAVE_PREEMPT ) || (ctrl_pin_rev.clr &PIN_PREEMPT ))) { -printf ("\"Save-VMX-preemption-timer\" control and/or \"Enable-VMX-preemption-timer\" control is not supported\n" ); +report_skip ("\"Save-VMX-preemption-timer\" control and/or \"Enable-VMX-preemption-timer\" control is not supported\n" );return ; }
@@ -7175,7 +7179,7 @@ static void test_efer(u32 fld, const char * fld_name, u32 ctrl_fld, efer_reserved_bits &= ~EFER_NX ;if (!ctrl_bit1) { -printf ("\"Load-IA32-EFER\" exit control not supported\n" ); +report_skip ("\"Load-IA32-EFER\" exit control not supported\n" ); goto test_entry_exit_mode; }
@@ -7258,7 +7262,7 @@ static void test_host_efer(void)static void test_guest_efer (void ) {if (!(ctrl_enter_rev.clr &ENT_LOAD_EFER )) { -printf ("\"Load-IA32-EFER\" entry control not supported\n" ); +report_skip ("\"Load-IA32-EFER\" entry control not supported\n" );return ; }
@@ -7349,7 +7353,7 @@ static void test_load_host_pat(void)* "load IA32_PAT" VM-exit control */ if (!(ctrl_exit_rev.clr &EXI_LOAD_PAT )) { -printf ("\"Load-IA32-PAT\" exit control not supported\n" ); +report_skip ("\"Load-IA32-PAT\" exit control not supported\n" );return ; }
@@ -7490,8 +7494,13 @@ static void test_perf_global_ctrl(u32 nr, const char *name, u32 ctrl_nr,static void test_load_host_perf_global_ctrl (void ) { +if (!cpu_has_perf_global_ctrl ()) { +report_skip ("IA32_PERF_GLOBAL_CTRL not supported\n" ); +return ; + } +if (!(ctrl_exit_rev.clr &EXI_LOAD_PERF )) { -printf ("\"load IA32_PERF_GLOBAL_CTRL\" exit control not supported\n" ); +report_skip ("\"load IA32_PERF_GLOBAL_CTRL\" exit control not supported\n" );return ; }
@@ -7502,8 +7511,13 @@ static void test_load_host_perf_global_ctrl(void)static void test_load_guest_perf_global_ctrl (void ) { +if (!cpu_has_perf_global_ctrl ()) { +report_skip ("IA32_PERF_GLOBAL_CTRL not supported\n" ); +return ; + } +if (!(ctrl_enter_rev.clr &ENT_LOAD_PERF )) { -printf ("\"load IA32_PERF_GLOBAL_CTRL\" entry control not supported\n" ); +report_skip ("\"load IA32_PERF_GLOBAL_CTRL\" entry control not supported\n" );return ; }
@@ -7809,7 +7823,7 @@ static void test_load_guest_pat(void)* "load IA32_PAT" VM-entry control */ if (!(ctrl_enter_rev.clr &ENT_LOAD_PAT )) { -printf ("\"Load-IA32-PAT\" entry control not supported\n" ); +report_skip ("\"Load-IA32-PAT\" entry control not supported\n" );return ; }
@@ -7833,7 +7847,7 @@ static void test_load_guest_bndcfgs(void)u64 bndcfgs;if (!(ctrl_enter_rev.clr &ENT_LOAD_BNDCFGS )) { -printf ("\"Load-IA32-BNDCFGS\" entry control not supported\n" ); +report_skip ("\"Load-IA32-BNDCFGS\" entry control not supported\n" );return ; }
base-commit: ca85dda2671e88d34acfbca6de48a9ab32b1810d
Signature · 1 line
2.27.0
PATCH v4 2/2 x86: Check platform vPMU capabilities before run lbr tests
Use new helper to check whether pmu is available and Perfmon/Debug capbilities are supported before read MSR_IA32_PERF_CAPABILITIES to avoid test failure. The issue can be captured when enable_pmu=0.
v4:
- Put the X86_FEATURE_PDCM to the right place. [Sean]
--- lib/x86/processor.h | 1 + x86/pmu_lbr.c | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 19 deletions(-)
lib/x86/processor.h +1 -0
@@ -146,6 +146,7 @@ static inline bool is_intel(void)*/ #define X86_FEATURE_MWAIT (CPUID(0x1, 0, ECX, 3))#define X86_FEATURE_VMX (CPUID(0x1, 0, ECX, 5)) +#define X86_FEATURE_PDCM (CPUID(0x1, 0, ECX, 15))#define X86_FEATURE_PCID (CPUID(0x1, 0, ECX, 17))#define X86_FEATURE_MOVBE (CPUID(0x1, 0, ECX, 22))#define X86_FEATURE_TSC_DEADLINE_TIMER (CPUID(0x1, 0, ECX, 24))
x86/pmu_lbr.c +13 -19
@@ -15,6 +15,7 @@#define MSR_LBR_SELECT 0x000001c8volatile int count; +u32 lbr_from, lbr_to; static noinline int compute_flag(int i) {
@@ -38,18 +39,6 @@ static noinline int lbr_test(void)return 0 ; } -union cpuid10_eax { -struct { -unsigned int version_id:8 ; -unsigned int num_counters:8 ; -unsigned int bit_width:8 ; -unsigned int mask_length:8 ; - } split; -unsigned int full; -} eax; - -u32 lbr_from, lbr_to; -static void init_lbr (void *index) {wrmsr (lbr_from + *(int *) index,0 );
@@ -63,7 +52,7 @@ static bool test_init_lbr_from_exception(u64 index)int main (int ac,char **av) { -struct cpuid id =cpuid (10 ); +u8 version =pmu_version ();u64 perf_cap;int max, i;
@@ -74,19 +63,24 @@ int main(int ac, char **av)return 0 ; } - perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); - eax.full = id.a; - -if (!eax.split.version_id) { +if (!version) {printf ("No pmu is detected!\n" );return report_summary (); } + +if (!this_cpu_has (X86_FEATURE_PDCM )) { +printf ("Perfmon/Debug Capabilities MSR isn't supported\n" ); +return report_summary (); + } + + perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); +if (!(perf_cap &PMU_CAP_LBR_FMT )) { -printf ("No LBR is detected!\n" ); +printf ("(Architectural) LBR is not supported.\n" );return report_summary (); } -printf ("PMU version: %d\n" , eax.split.version_id); +printf ("PMU version: %d\n" , version);printf ("LBR version: %ld\n" , perf_cap &PMU_CAP_LBR_FMT );/* Look for LBR from and to MSRs */
Signature · 1 line
2.27.0
Sean Christopherson
reviewerRe: [kvm-unit-tests PATCH v4 2/2] x86: Check platform vPMU capabilities before run lbr tests
Quoted 10 lines · Yang Weijiang
Use new helper to check whether pmu is available and Perfmon/Debug capbilities are supported before read
MSR_IA32_PERF_CAPABILITIESto avoid test failure. The issue can be captured when enable_pmu=0.Suggested-by Sean Christopherson <[email protected]>Signed-off-by Yang Weijiang <[email protected]>v4:
- Put theX86_FEATURE_PDCMto the right place. [Sean]
---
<version info goes here>
Quoted 57 lines
lib/x86/processor.h | 1 + x86/pmu_lbr.c | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 19 deletions(-)lib/x86/processor.h +1
-0@@ -146,6 +146,7 @@ static inline bool is_intel(void)*/ #define X86_FEATURE_MWAIT (CPUID(0x1, 0, ECX, 3))#define X86_FEATURE_VMX (CPUID(0x1, 0, ECX, 5)) +#define X86_FEATURE_PDCM (CPUID(0x1, 0, ECX, 15))#define X86_FEATURE_PCID (CPUID(0x1, 0, ECX, 17))#define X86_FEATURE_MOVBE (CPUID(0x1, 0, ECX, 22))#define X86_FEATURE_TSC_DEADLINE_TIMER (CPUID(0x1, 0, ECX, 24))x86/pmu_lbr.c +2
-13@@ -15,6 +15,7 @@#define MSR_LBR_SELECT 0x000001c8volatile int count; +u32 lbr_from, lbr_to; static noinline int compute_flag(int i) {@@ -38,18 +39,6 @@ static noinline int lbr_test(void)return 0 ; } -union cpuid10_eax { -struct { -unsigned int version_id:8 ; -unsigned int num_counters:8 ; -unsigned int bit_width:8 ; -unsigned int mask_length:8 ; - } split; -unsigned int full; -} eax; - -u32 lbr_from, lbr_to; -static void init_lbr (void *index) {wrmsr (lbr_from + *(int *) index,0 );@@ -63,7 +52,7 @@ static bool test_init_lbr_from_exception(u64 index)int main (int ac,char **av) { -struct cpuid id =cpuid (10 ); +u8 version =pmu_version ();u64 perf_cap;int max, i;
x86/pmu_lbr.c int main(int ac, char **av) · line 66
Quoted 8 lines
x86/pmu_lbr.c +1
-4@@ -74,19 +63,24 @@ int main(int ac, char **av)return 0 ; } - perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); - eax.full = id.a; - -if (!eax.split.version_id) { +if (!version) {
If the previous patch exposes cpu_has_pmu(), then this open coded check goes away in favor of the more obvious:
if (!cpu_has_pmu()) {Quoted 9 lines
x86/pmu_lbr.c +6
-0printf ("No pmu is detected!\n" );return report_summary (); } + +if (!this_cpu_has (X86_FEATURE_PDCM )) { +printf ("Perfmon/Debug Capabilities MSR isn't supported\n" ); +return report_summary (); + } +
x86/pmu_lbr.c int main(int ac, char **av) · line 83
Quoted 10 lines
x86/pmu_lbr.c +4
-2+ perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); +if (!(perf_cap &PMU_CAP_LBR_FMT )) { -printf ("No LBR is detected!\n" ); +printf ("(Architectural) LBR is not supported.\n" );return report_summary (); } -printf ("PMU version: %d\n" , eax.split.version_id); +printf ("PMU version: %d\n" , version);
And with the open coded check gone, this can be:
printf("PMU version: %d\n", pmu_version());Quoted 6 lines
x86/pmu_lbr.c +0
-0printf ("LBR version: %ld\n" , perf_cap &PMU_CAP_LBR_FMT );/* Look for LBR from and to MSRs */ Signature · 1 line
2.27.0
Re: [kvm-unit-tests PATCH v4 2/2] x86: Check platform vPMU capabilities before run lbr tests
Quoted 5 lines · Sean Christopherson
Quoted 4 lines · Yang Weijiang
Use new helper to check whether pmu is available and Perfmon/Debug capbilities are supported before read
MSR_IA32_PERF_CAPABILITIESto avoid test failure. The issue can be captured when enable_pmu=0.
Quoted 7 lines
Quoted 6 lines
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Yang Weijiang <[email protected]>v4:
- Put theX86_FEATURE_PDCMto the right place. [Sean]
---<version info goes here>
Will change it.
Quoted 69 lines
Quoted 58 lines
lib/x86/processor.h | 1 + x86/pmu_lbr.c | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 19 deletions(-)lib/x86/processor.h +1
-0@@ -146,6 +146,7 @@ static inline bool is_intel(void)*/ #define X86_FEATURE_MWAIT (CPUID(0x1, 0, ECX, 3))#define X86_FEATURE_VMX (CPUID(0x1, 0, ECX, 5)) +#define X86_FEATURE_PDCM (CPUID(0x1, 0, ECX, 15))#define X86_FEATURE_PCID (CPUID(0x1, 0, ECX, 17))#define X86_FEATURE_MOVBE (CPUID(0x1, 0, ECX, 22))#define X86_FEATURE_TSC_DEADLINE_TIMER (CPUID(0x1, 0, ECX, 24))x86/pmu_lbr.c +2
-13@@ -15,6 +15,7 @@#define MSR_LBR_SELECT 0x000001c8volatile int count; +u32 lbr_from, lbr_to; static noinline int compute_flag(int i) {@@ -38,18 +39,6 @@ static noinline int lbr_test(void)return 0 ; } -union cpuid10_eax { -struct { -unsigned int version_id:8 ; -unsigned int num_counters:8 ; -unsigned int bit_width:8 ; -unsigned int mask_length:8 ; - } split; -unsigned int full; -} eax; - -u32 lbr_from, lbr_to; -static void init_lbr (void *index) {wrmsr (lbr_from + *(int *) index,0 );@@ -63,7 +52,7 @@ static bool test_init_lbr_from_exception(u64 index)int main (int ac,char **av) { -struct cpuid id =cpuid (10 ); +u8 version =pmu_version ();u64 perf_cap;int max, i;x86/pmu_lbr.c int main(int ac, char **av) · line 66
Quoted 8 lines
x86/pmu_lbr.c +1
-4@@ -74,19 +63,24 @@ int main(int ac, char **av)return 0 ; } - perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); - eax.full = id.a; - -if (!eax.split.version_id) { +if (!version) {If the previous patch exposes
cpu_has_pmu(), then this open coded check goes away in favor of the more obvious:
Quoted 1 line
if (!cpu_has_pmu()) {Yep.
Quoted 17 lines
Quoted 17 lines
x86/pmu_lbr.c +9
-1printf ("No pmu is detected!\n" );return report_summary (); } + +if (!this_cpu_has (X86_FEATURE_PDCM )) { +printf ("Perfmon/Debug Capabilities MSR isn't supported\n" ); +return report_summary (); + } + + perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); +if (!(perf_cap &PMU_CAP_LBR_FMT )) { -printf ("No LBR is detected!\n" ); +printf ("(Architectural) LBR is not supported.\n" );return report_summary (); }
Quoted 5 lines
x86/pmu_lbr.c int main(int ac, char **av) · line 83
Quoted 2 lines
x86/pmu_lbr.c +1
-1-printf ("PMU version: %d\n" , eax.split.version_id); +printf ("PMU version: %d\n" , version);And with the open coded check gone, this can be:
printf("PMU version: %d\n", pmu_version());
Will change it. Thank you!
Quoted 7 lines
Quoted 7 lines
x86/pmu_lbr.c +0
-0printf ("LBR version: %ld\n" , perf_cap &PMU_CAP_LBR_FMT );/* Look for LBR from and to MSRs */ Signature · 1 line
2.27.0
Sean Christopherson
reviewerQuoted 7 lines · Yang Weijiang
Add helpers to check whether
MSR_CORE_PERF_GLOBAL_CTRLand rdpmc are supported in KVM. When pmu is disabled with enable_pmu=0, readingMSR_CORE_PERF_GLOBAL_CTRLor executing rdpmc leads to #GP, so skip related tests in this case to avoid test failure.Opportunistically replace some "printf" with "
report_skip" to make the output log clean.
Ooof, these end up dominating the patch. Can you split them to a separate prep patch? Thanks!
Quoted 6 lines
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Yang Weijiang <[email protected]>v4:
- Usesupported_fn()to make the code nicer. [Sean]
- Replace some of the printf withreport_skipto make the results clean. [Sean]
Put the versioning info below the three dashes so that it doesn't show up in the final changelog.
Quoted 1 line
---
<version info goes here>
Quoted 28 lines
lib/x86/processor.h | 10 ++++++++++ x86/vmx_tests.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 13 deletions(-)lib/x86/processor.h +10
-0@@ -690,4 +690,14 @@ static inline bool cpuid_osxsave(void) return cpuid(1).c & (1 << (X86_FEATURE_OSXSAVE % 32)); } +static inline u8 pmu_version (void ) +{ +return cpuid (10 ).a &0xff ; +} + +static inline bool cpu_has_perf_global_ctrl (void ) +{ +return pmu_version () >1 ; +} +#endif x86/vmx_tests.c +0
-0
x86/vmx_tests.c static bool monitor_supported(void) · line 855
Quoted 4 lines
x86/vmx_tests.c +1
-0@@ -852,6 +852,10 @@ static bool monitor_supported(void)return this_cpu_has (X86_FEATURE_MWAIT ); } +static inline bool pmu_supported (void ) {
Curly brace goes on a new line.
x86/vmx_tests.c static bool monitor_supported(void) · line 857
Quoted 2 lines
x86/vmx_tests.c +2
-0+return !!pmu_version (); +}
Why not put this in processor.h? And maybe call it cpu_has_pmu()?
Quoted 10 lines · Sean Christopherson
Quoted 7 lines · Yang Weijiang
Add helpers to check whether
MSR_CORE_PERF_GLOBAL_CTRLand rdpmc are supported in KVM. When pmu is disabled with enable_pmu=0, readingMSR_CORE_PERF_GLOBAL_CTRLor executing rdpmc leads to #GP, so skip related tests in this case to avoid test failure.Opportunistically replace some "printf" with "
report_skip" to make the output log clean.Ooof, these end up dominating the patch. Can you split them to a separate prep patch? Thanks!
Welcome back!
Will do it, thanks!
Quoted 4 lines
Quoted 4 lines
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Yang Weijiang <[email protected]>
Quoted 8 lines
Quoted 3 lines
v4:
- Usesupported_fn()to make the code nicer. [Sean]
- Replace some of the printf withreport_skipto make the results clean. [Sean]Put the versioning info below the three dashes so that it doesn't show up in the final changelog.
Quoted 1 line
---
<version info goes here>
OK.
Quoted 32 lines
Quoted 32 lines
lib/x86/processor.h | 10 ++++++++++ x86/vmx_tests.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 13 deletions(-)lib/x86/processor.h +10
-0@@ -690,4 +690,14 @@ static inline bool cpuid_osxsave(void) return cpuid(1).c & (1 << (X86_FEATURE_OSXSAVE % 32)); } +static inline u8 pmu_version (void ) +{ +return cpuid (10 ).a &0xff ; +} + +static inline bool cpu_has_perf_global_ctrl (void ) +{ +return pmu_version () >1 ; +} +#endif x86/vmx_tests.c +0
-0@@ -852,6 +852,10 @@ static bool monitor_supported(void)return this_cpu_has (X86_FEATURE_MWAIT ); }
Quoted 2 lines
x86/vmx_tests.c static bool monitor_supported(void) · line 855
Quoted 1 line
x86/vmx_tests.c +1
-0+static inline bool pmu_supported (void ) {Curly brace goes on a new line.
Sorry for the typo.
Quoted 4 lines
x86/vmx_tests.c static bool monitor_supported(void) · line 857
Quoted 3 lines
x86/vmx_tests.c +2
-0+return !!pmu_version (); +}Why not put this in
processor.h? And maybe call itcpu_has_pmu()?
Good suggestion, then it can serve other apps. Thank you!