x86/pmu: Add Intel Guest Transactional (commited) cycles testcase
PATCH 1/1 x86/pmu: Add Intel Guest Transactional (commited) cycles testcase
From: Like Xu <[email protected]>
On Intel platforms with TSX feature, pmu users in guest can collect the commited or total transactional cycles for a tsx-enabled workload, adding new test cases to cover them, as they are not strictly the same as normal hardware events from the KVM implementation point of view.
--- x86/pmu.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)
x86/pmu.c +72 -1
@@ -20,7 +20,7 @@typedef struct {uint32_t ctr; -uint32_t config; +uint64_t config;uint64_t count;int idx; }pmu_counter_t ;
@@ -547,6 +547,76 @@ static void check_emulated_instr(void)report_prefix_pop (); } +#define _XBEGIN_STARTED (~0u) + +static inline int _xbegin (void ) +{ +int ret = _XBEGIN_STARTED; + asmvolatile (".byte 0xc7,0xf8 ; .long 0" :"+a" (ret) ::"memory" ); +return ret; +} + +static inline void _xend (void ) +{ + asmvolatile (".byte 0x0f,0x01,0xd5" :::"memory" ); +} + +int *ptr; + +static void tsx_fault (void ) +{ +int value =0 ; + + ptr =NULL ; +if (_xbegin () == _XBEGIN_STARTED) { + value++; +// causes abort + *ptr = value; +_xend (); + } +} + +static void tsx_normal (void ) +{ +int value =0 ; + +if (_xbegin () == _XBEGIN_STARTED) { + value++; +_xend (); + } +} + +static void check_tsx_cycles (void ) +{ +pmu_counter_t cnt; +int i; + +if (!this_cpu_has (X86_FEATURE_RTM ) || !this_cpu_has (X86_FEATURE_HLE )) +return ; + +report_prefix_push ("TSX cycles" ); + +for (i =0 ; i < pmu.nr_gp_counters; i++) { + cnt.ctr =MSR_GP_COUNTERx (i); + +if (i ==2 ) +/* Transactional cycles commited only on gp counter 2 */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x30000003c ; +else +/* Transactional cycles */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x10000003c ; + +start_event (&cnt); +tsx_fault (); +tsx_normal (); +stop_event (&cnt); + +report (cnt.count >0 ,"gp cntr-%d" , i); + } + +report_prefix_pop (); +} +static void check_counters (void ) {if (is_fep_available ())
@@ -559,6 +629,7 @@ static void check_counters(void)check_counter_overflow ();check_gp_counter_cmask ();check_running_counter_wrmsr (); +check_tsx_cycles (); }static void do_unsupported_width_counter_write (void *index)
Signature · 1 line
2.38.1
PATCH 1/1 KVM: x86/pmu: Prevent zero period event from being repeatedly released
From: Like Xu <[email protected]>
The current vPMU can reuse the same pmc->perf_event for the same hardware event via pmc_pause/resume_counter(), but this optimization does not apply to a portion of the TSX events (e.g., "event=0x3c,in_tx=1, in_tx_cp=1"), where event->attr.sample_period is legally zero at creation, thus making the perf call to perf_event_period() meaningless (no need to adjust sample period in this case), and instead causing such reusable perf_events to be repeatedly released and created.
Avoid releasing zero sample_period events by checking is_sampling_event() to follow the previously enable/disable optimization.
--- arch/x86/kvm/pmu.c | 3 ++- arch/x86/kvm/pmu.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kvm/pmu.c +2 -1
@@ -238,7 +238,8 @@ static bool pmc_resume_counter(struct kvm_pmc *pmc)return false;/* recalibrate sample period and check if it's accepted by perf core */ -if (perf_event_period (pmc->perf_event, +if (is_sampling_event (pmc->perf_event) && +perf_event_period (pmc->perf_event,get_sample_period (pmc, pmc->counter)))return false;
arch/x86/kvm/pmu.h +2 -1
@@ -140,7 +140,8 @@ static inline u64 get_sample_period(struct kvm_pmc *pmc, u64 counter_value)static inline void pmc_update_sample_period (struct kvm_pmc *pmc) { -if (!pmc->perf_event || pmc->is_paused) +if (!pmc->perf_event || pmc->is_paused || + !is_sampling_event (pmc->perf_event))return ; perf_event_period(pmc->perf_event,
Signature · 1 line
2.38.1
Sean Christopherson
maintainerRe: [PATCH] KVM: x86/pmu: Prevent zero period event from being repeatedly released
Please don't mix kernel and KVM-unit-tests patches in the same "series", for those of us that have become dependent on b4, mixing patches for two separate repos makes life miserable.
The best alternative I have come up with is to post the KVM patch(es), and then provide a lore link in the KUT patch(es). It means waiting a few minutes before sending the KUT if you want to double check that you got the lore link right, but I find that it's fairly easy to account for that in my workflow.
Quoted 50 lines · Like Xu
From: Like Xu <[email protected]>
The current vPMU can reuse the same
pmc->perf_eventfor the same hardware event via pmc_pause/resume_counter(), but this optimization does not apply to a portion of the TSX events (e.g., "event=0x3c,in_tx=1, in_tx_cp=1"), whereevent->attr.sample_periodis legally zero at creation, thus making the perf call toperf_event_period()meaningless (no need to adjust sample period in this case), and instead causing such reusableperf_eventsto be repeatedly released and created.Avoid releasing zero
sample_periodevents by checkingis_sampling_event()to follow the previously enable/disable optimization.Signed-off-by Like Xu <[email protected]>--- arch/x86/kvm/pmu.c | 3 ++- arch/x86/kvm/pmu.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)arch/x86/kvm/pmu.c +2
-1@@ -238,7 +238,8 @@ static bool pmc_resume_counter(struct kvm_pmc *pmc)return false;/* recalibrate sample period and check if it's accepted by perf core */ -if (perf_event_period (pmc->perf_event, +if (is_sampling_event (pmc->perf_event) && +perf_event_period (pmc->perf_event,get_sample_period (pmc, pmc->counter)))return false;arch/x86/kvm/pmu.h +2
-1@@ -140,7 +140,8 @@ static inline u64 get_sample_period(struct kvm_pmc *pmc, u64 counter_value)static inline void pmc_update_sample_period (struct kvm_pmc *pmc) { -if (!pmc->perf_event || pmc->is_paused) +if (!pmc->perf_event || pmc->is_paused || + !is_sampling_event (pmc->perf_event))return ; perf_event_period(pmc->perf_event,Signature · 1 line
2.38.1
Paolo Bonzini
maintainerRe: [PATCH] Prevent zero period event from being repeatedly released
In reply to Like XuQueued, thanks. Please resubmit the test though.
Paolo
Quoted 65 lines · Like Xu
From: Like Xu <[email protected]>
On Intel platforms with TSX feature, pmu users in guest can collect the commited or total transactional cycles for a tsx-enabled workload, adding new test cases to cover them, as they are not strictly the same as normal hardware events from the KVM implementation point of view.
Signed-off-by Like Xu <[email protected]>--- x86/pmu.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)x86/pmu.c +37
-1@@ -20,7 +20,7 @@typedef struct {uint32_t ctr; -uint32_t config; +uint64_t config;uint64_t count;int idx; }pmu_counter_t ;@@ -547,6 +547,76 @@ static void check_emulated_instr(void)report_prefix_pop (); } +#define _XBEGIN_STARTED (~0u) + +static inline int _xbegin (void ) +{ +int ret = _XBEGIN_STARTED; + asmvolatile (".byte 0xc7,0xf8 ; .long 0" :"+a" (ret) ::"memory" ); +return ret; +} + +static inline void _xend (void ) +{ + asmvolatile (".byte 0x0f,0x01,0xd5" :::"memory" ); +} + +int *ptr; + +static void tsx_fault (void ) +{ +int value =0 ; + + ptr =NULL ; +if (_xbegin () == _XBEGIN_STARTED) { + value++; +// causes abort + *ptr = value; +_xend (); + } +} + +static void tsx_normal (void ) +{ +int value =0 ; + +if (_xbegin () == _XBEGIN_STARTED) { + value++; +_xend ();
x86/pmu.c static void check_emulated_instr(void) · line 595
Quoted 10 lines
x86/pmu.c +10
-0+ } +} + +static void check_tsx_cycles (void ) +{ +pmu_counter_t cnt; +int i; + +if (!this_cpu_has (X86_FEATURE_RTM ) || !this_cpu_has (X86_FEATURE_HLE )) +return ;
Since the test case is for xbegin/xend, HLE check may omit as it's for other X-instructions.
Quoted 9 lines
x86/pmu.c +9
-0+ +report_prefix_push ("TSX cycles" ); + +for (i =0 ; i < pmu.nr_gp_counters; i++) { + cnt.ctr =MSR_GP_COUNTERx (i); + +if (i ==2 ) +/* Transactional cycles commited only on gp counter 2 */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x30000003c ;
x86/pmu.c static void check_emulated_instr(void) · line 614
Quoted 10 lines
x86/pmu.c +10
-0+else +/* Transactional cycles */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x10000003c ; + +start_event (&cnt); +tsx_fault (); +tsx_normal (); +stop_event (&cnt); + +report (cnt.count >0 ,"gp cntr-%d" , i);
The purpose is to collect total cycles, why not print out the data here for each GP counter?
Quoted 16 lines
x86/pmu.c +6
-0+ } + +report_prefix_pop (); +} +static void check_counters (void ) {if (is_fep_available ())@@ -559,6 +629,7 @@ static void check_counters(void)check_counter_overflow ();check_gp_counter_cmask ();check_running_counter_wrmsr (); +check_tsx_cycles (); }static void do_unsupported_width_counter_write (void *index)
Sean Christopherson
maintainerQuoted 26 lines · Like Xu
From: Like Xu <[email protected]>
On Intel platforms with TSX feature, pmu users in guest can collect the commited or total transactional cycles for a tsx-enabled workload, adding new test cases to cover them, as they are not strictly the same as normal hardware events from the KVM implementation point of view.
Signed-off-by Like Xu <[email protected]>--- x86/pmu.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)x86/pmu.c +1
-1@@ -20,7 +20,7 @@typedef struct {uint32_t ctr; -uint32_t config; +uint64_t config;uint64_t count;int idx; }pmu_counter_t ;
x86/pmu.c static void check_emulated_instr(void) · line 552
Quoted 6 lines
x86/pmu.c +3
-0@@ -547,6 +547,76 @@ static void check_emulated_instr(void)report_prefix_pop (); } +#define _XBEGIN_STARTED (~0u) + +static inline int
This should be "unsigned int". EAX can yield a negative value, e.g. via "XABORT 0xff", which is why the compiler instrinsics use this explicit, unsigned value (that relies on reserved bits in the abort status).
x86/pmu.c static void check_emulated_instr(void) · line 553
Quoted 1 line
x86/pmu.c +0
-0_xbegin (void)
These having nothing to do with the PMU, i.e. belong in processor.h.
The naming is also non-stanard, i.e. drop the underscore. I assume you're trying to match the compiler instrinsics, but that's bound to do more harm than good. Either use the instrinsics or write code that aligns with KUT's style. Using instrinsics is probably a bad idea because eventually we'll want to do something weird, e.g. provide a bogus fallback address. And having to go lookup gcc/clang documentation is rather annoything.
x86/pmu.c static void check_emulated_instr(void) · line 554
Quoted 2 lines
x86/pmu.c +2
-0+{ +int ret = _XBEGIN_STARTED;
Newline after declarations.
x86/pmu.c static void check_emulated_instr(void) · line 555
Quoted 1 line
x86/pmu.c +1
-0+ asmvolatile (".byte 0xc7,0xf8 ; .long 0" :"+a" (ret) ::"memory" );
This is just mean.
unsigned int ret = XBEGIN_STARTED;
asm volatile("xbegin 1f\n\t"
"1:\n\t"
: "+a" (ret) :: "memory");
return ret;x86/pmu.c static void check_emulated_instr(void) · line 561
Quoted 6 lines
x86/pmu.c +6
-0+return ret; +} + +static inline void _xend (void ) +{ + asmvolatile (".byte 0x0f,0x01,0xd5" :::"memory" );
Like XBEGIN, use the mnemonic.
x86/pmu.c static void check_emulated_instr(void) · line 564
Quoted 3 lines
x86/pmu.c +3
-0+} + +int *ptr;
I'm honestly at a loss for words.
x86/pmu.c static void check_emulated_instr(void) · line 566
Quoted 1 line
x86/pmu.c +1
-0+static void tsx_fault (void )
s/fault/abort. Yes, a fault causes an abort, but no fault is ever observed by software. Though I don't quite understand why helpers are needed in the first place.
x86/pmu.c static void check_emulated_instr(void) · line 571
Quoted 5 lines
x86/pmu.c +5
-0+{ +int value =0 ; + + ptr =NULL ; +if (_xbegin () == _XBEGIN_STARTED) {
Space after the "if".
x86/pmu.c static void check_emulated_instr(void) · line 574
Quoted 3 lines
x86/pmu.c +3
-0+ value++; +// causes abort + *ptr = value;
/* Generate a non-canonical #GP to trigger ABORT. */ (int *)NONCANONICAL) = 0;
x86/pmu.c static void check_emulated_instr(void) · line 575
Quoted 1 line
x86/pmu.c +1
-0+_xend ();
Why bother with XEND?
x86/pmu.c static void check_emulated_instr(void) · line 584
Quoted 9 lines
x86/pmu.c +9
-0+ } +} + +static void tsx_normal (void ) +{ +int value =0 ; + +if (_xbegin () == _XBEGIN_STARTED) { + value++;
What's the purpose of incrementing an arbitrary value?
x86/pmu.c static void check_emulated_instr(void) · line 585
Quoted 1 line
x86/pmu.c +1
-0+_xend ();
Does this test rely on the region being successfully committed? If so, the test is guaranteed to be flaky, e.g. due to a host IRQ at the "wrong" time. Assuming success is not required, please add a comment describing the requirements.
Quoted 16 lines
x86/pmu.c +16
-0+ } +} + +static void check_tsx_cycles (void ) +{ +pmu_counter_t cnt; +int i; + +if (!this_cpu_has (X86_FEATURE_RTM ) || !this_cpu_has (X86_FEATURE_HLE )) +return ; + +report_prefix_push ("TSX cycles" ); + +for (i =0 ; i < pmu.nr_gp_counters; i++) { + cnt.ctr =MSR_GP_COUNTERx (i); +
x86/pmu.c static void check_emulated_instr(void) · line 611
Quoted 10 lines
x86/pmu.c +10
-0+if (i ==2 ) +/* Transactional cycles commited only on gp counter 2 */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x30000003c ; +else +/* Transactional cycles */ + cnt.config =EVNTSEL_OS |EVNTSEL_USR |0x10000003c ; + +start_event (&cnt); +tsx_fault (); +tsx_normal ();
As a above, why bother with helpers? Can't this just be:
start_event(&cnt); /* Generate a non-canonical #GP to trigger ABORT. */ if (xbegin() == XBEGIN_STARTED) *(int *)NONCANONICAL = 0; /* <comment about what requirements of this code> */ if (xbegin() == XBEGIN_STARTED) xend(); stop_event(&cnt);
Quoted 22 lines
x86/pmu.c +9
-0+stop_event (&cnt); + +report (cnt.count >0 ,"gp cntr-%d" , i); + } + +report_prefix_pop (); +} +static void check_counters (void ) {if (is_fep_available ())@@ -559,6 +629,7 @@ static void check_counters(void)check_counter_overflow ();check_gp_counter_cmask ();check_running_counter_wrmsr (); +check_tsx_cycles (); }static void do_unsupported_width_counter_write (void *index)Signature · 1 line
2.38.1