perf intel-pt: Fix PEBS-via-PT with registers
Adrian Hunter
reviewercover perf intel-pt: Fix PEBS-via-PT with registers
Hi
Here are some more Intel PT fixes for v5.8.
Adrian Hunter (3):
perf intel-pt: Fix recording PEBS-via-PT with registers perf intel-pt: Fix displaying PEBS-via-PT with registers perf intel-pt: Fix PEBS sample for XMM registers
tools/perf/arch/x86/util/intel-pt.c | 1 + tools/perf/builtin-script.c | 2 +- tools/perf/util/evsel.c | 4 ++-- tools/perf/util/intel-pt.c | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH 1/3 perf intel-pt: Fix recording PEBS-via-PT with registers
When recording PEBS-via-PT, the kernel will not accept the intel_pt event with register sampling e.g.
# perf record --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l
Error:
intel_pt/branch=0/: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'Fix by suppressing register sampling on the intel_pt evsel.
--- tools/perf/arch/x86/util/intel-pt.c | 1 + tools/perf/util/evsel.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
tools/perf/arch/x86/util/intel-pt.c +1 -0
@@ -641,6 +641,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } evsel->core.attr.freq =0 ; evsel->core.attr.sample_period =1 ; + evsel->no_aux_samples = true; intel_pt_evsel = evsel; opts->full_auxtrace = true; }
tools/perf/util/evsel.c +2 -2
@@ -1014,12 +1014,12 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,if (callchain && callchain->enabled && !evsel->no_aux_samples)evsel__config_callchain (evsel, opts, callchain); -if (opts->sample_intr_regs) { +if (opts->sample_intr_regs && !evsel->no_aux_samples) { attr->sample_regs_intr = opts->sample_intr_regs;evsel__set_sample_bit (evsel,REGS_INTR ); } -if (opts->sample_user_regs) { +if (opts->sample_user_regs && !evsel->no_aux_samples) { attr->sample_regs_user |= opts->sample_user_regs;evsel__set_sample_bit (evsel,REGS_USER ); }
Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/3] perf intel-pt: Fix recording PEBS-via-PT with registers
Em Tue, Jun 30, 2020 at 04:39:33PM +0300, Adrian Hunter escreveu:
Quoted 8 lines
When recording PEBS-via-PT, the kernel will not accept the
intel_ptevent with register sampling e.g.# perf record --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Error: intel_pt/branch=0/: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'Fix by suppressing register sampling on the
intel_ptevsel.
Next time please inform what is the hardware that supports PEBS-via-PT, I tried this on a:
[ 0.245654] smpboot: CPU0: Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz (family: 0x6, model: 0x8e, stepping: 0xa) [ 0.245791] Performance Events: PEBS fmt3+, Skylake events, 32-deep LBR, full-width counters, Intel PMU driver.
And even after this fix I get:
[root@quaco ~]# perf record --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Error:
branch-loads: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' [root@quaco ~]#
Further details:
[root@quaco ~]# perf record -vv --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Using CPUID GenuineIntel-6-8E-Aintel_pt default config: tsc,mtc,mtc_period=3,psb_period=3,pt,branch
Attempting to add event pmu 'intel_pt' with 'branch,' that may result in non-fatal errors
After aliases, add event pmu 'intel_pt' with 'branch,' that may result in non-fatal errorsnr_cblocks: 0
affinity: SYS
mmap flush: 1
comp level: 0
------------------------------------------------------------perf_event_attr:
type 8
size 120
config 0x300c601
{ sample_period, sample_freq } 10000
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
enable_on_exec 1
sample_id_all 1
exclude_guest 1------------------------------------------------------------sys_perf_event_open: pid 11131 cpu 0 group_fd -1 flags 0x8 = 5sys_perf_event_open: pid 11131 cpu 1 group_fd -1 flags 0x8 = 6sys_perf_event_open: pid 11131 cpu 2 group_fd -1 flags 0x8 = 7sys_perf_event_open: pid 11131 cpu 3 group_fd -1 flags 0x8 = 9sys_perf_event_open: pid 11131 cpu 4 group_fd -1 flags 0x8 = 10sys_perf_event_open: pid 11131 cpu 5 group_fd -1 flags 0x8 = 11sys_perf_event_open: pid 11131 cpu 6 group_fd -1 flags 0x8 = 12sys_perf_event_open: pid 11131 cpu 7 group_fd -1 flags 0x8 = 13
------------------------------------------------------------perf_event_attr:
type 3
size 120
config 0x5
{ sample_period, sample_freq } 10000
sample_type IP|TID|TIME|IDENTIFIER|REGS_INTR
read_format ID
inherit 1
precise_ip 3
sample_id_all 1
exclude_guest 1
aux_output 1
sample_regs_intr 0xff0fff------------------------------------------------------------sys_perf_event_open: pid 11131 cpu 0 group_fd 5 flags 0x8 sys_perf_event_open failed, error -95
Error:
branch-loads: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' [root@quaco ~]#
Quoted 41 lines
Signed-off-by Adrian Hunter <[email protected]>Fixes 9e64cefe4335b ("perf intel-pt: Process options for PEBS event synthesis")--- tools/perf/arch/x86/util/intel-pt.c | 1 + tools/perf/util/evsel.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)tools/perf/arch/x86/util/intel-pt.c +1
-0@@ -641,6 +641,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } evsel->core.attr.freq =0 ; evsel->core.attr.sample_period =1 ; + evsel->no_aux_samples = true; intel_pt_evsel = evsel; opts->full_auxtrace = true; }tools/perf/util/evsel.c +2
-2@@ -1014,12 +1014,12 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,if (callchain && callchain->enabled && !evsel->no_aux_samples)evsel__config_callchain (evsel, opts, callchain); -if (opts->sample_intr_regs) { +if (opts->sample_intr_regs && !evsel->no_aux_samples) { attr->sample_regs_intr = opts->sample_intr_regs;evsel__set_sample_bit (evsel,REGS_INTR ); } -if (opts->sample_user_regs) { +if (opts->sample_user_regs && !evsel->no_aux_samples) { attr->sample_regs_user |= opts->sample_user_regs;evsel__set_sample_bit (evsel,REGS_USER ); }Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 1/3] perf intel-pt: Fix recording PEBS-via-PT with registers
Em Fri, Jul 03, 2020 at 08:25:03AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 8 lines
Em Tue, Jun 30, 2020 at 04:39:33PM +0300, Adrian Hunter escreveu:
Quoted 7 lines
When recording PEBS-via-PT, the kernel will not accept the
intel_ptevent with register sampling e.g.# perf record --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Error: intel_pt/branch=0/: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'
Quoted 7 lines
Quoted 1 line
Fix by suppressing register sampling on the
intel_ptevsel.Next time please inform what is the hardware that supports PEBS-via-PT, I tried this on a:
[ 0.245654] smpboot: CPU0: Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz (family: 0x6, model: 0x8e, stepping: 0xa) [ 0.245791] Performance Events: PEBS fmt3+, Skylake events, 32-deep LBR, full-width counters, Intel PMU driver.
Also:
[acme@quaco perf]$ uname -a
Linux quaco 5.8.0-rc3+ #2 SMP Tue Jun 30 09:47:17 -03 2020 x86_64 x86_64 x86_64 GNU/Linux
Quoted 110 lines
And even after this fix I get:
[root@quaco ~]# perf record --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Error:
branch-loads: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' [root@quaco ~]#Further details:
[root@quaco ~]# perf record -vv --kcore -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l Using CPUID GenuineIntel-6-8E-A
intel_ptdefault config: tsc,mtc,mtc_period=3,psb_period=3,pt,branch
Attempting to add event pmu 'intel_pt' with 'branch,' that may result in non-fatal errors
After aliases, add event pmu 'intel_pt' with 'branch,' that may result in non-fatal errorsnr_cblocks: 0
affinity: SYS
mmap flush: 1
comp level: 0
------------------------------------------------------------perf_event_attr:type 8 size 120 config 0x300c601 { sample_period, sample_freq } 10000 sample_type IP|TID|TIME|CPU|IDENTIFIER read_format ID disabled 1 inherit 1 enable_on_exec 1 sample_id_all 1 exclude_guest 1------------------------------------------------------------
sys_perf_event_open: pid 11131 cpu 0group_fd-1 flags0x8= 5sys_perf_event_open: pid 11131 cpu 1group_fd-1 flags0x8= 6sys_perf_event_open: pid 11131 cpu 2group_fd-1 flags0x8= 7sys_perf_event_open: pid 11131 cpu 3group_fd-1 flags0x8= 9sys_perf_event_open: pid 11131 cpu 4group_fd-1 flags0x8= 10sys_perf_event_open: pid 11131 cpu 5group_fd-1 flags0x8= 11sys_perf_event_open: pid 11131 cpu 6group_fd-1 flags0x8= 12sys_perf_event_open: pid 11131 cpu 7group_fd-1 flags0x8= 13
------------------------------------------------------------perf_event_attr:type 3 size 120 config 0x5 { sample_period, sample_freq } 10000 sample_type IP|TID|TIME|IDENTIFIER|REGS_INTR read_format ID inherit 1 precise_ip 3 sample_id_all 1 exclude_guest 1 aux_output 1 sample_regs_intr 0xff0fff------------------------------------------------------------
sys_perf_event_open: pid 11131 cpu 0group_fd5 flags0x8sys_perf_event_openfailed, error -95
Error:
branch-loads: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' [root@quaco ~]#Quoted 41 lines
Signed-off-by Adrian Hunter <[email protected]>Fixes 9e64cefe4335b ("perf intel-pt: Process options for PEBS event synthesis")--- tools/perf/arch/x86/util/intel-pt.c | 1 + tools/perf/util/evsel.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)tools/perf/arch/x86/util/intel-pt.c +1
-0@@ -641,6 +641,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } evsel->core.attr.freq =0 ; evsel->core.attr.sample_period =1 ; + evsel->no_aux_samples = true; intel_pt_evsel = evsel; opts->full_auxtrace = true; }tools/perf/util/evsel.c +2
-2@@ -1014,12 +1014,12 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,if (callchain && callchain->enabled && !evsel->no_aux_samples)evsel__config_callchain (evsel, opts, callchain); -if (opts->sample_intr_regs) { +if (opts->sample_intr_regs && !evsel->no_aux_samples) { attr->sample_regs_intr = opts->sample_intr_regs;evsel__set_sample_bit (evsel,REGS_INTR ); } -if (opts->sample_user_regs) { +if (opts->sample_user_regs && !evsel->no_aux_samples) { attr->sample_regs_user |= opts->sample_user_regs;evsel__set_sample_bit (evsel,REGS_USER ); }Signature · 1 line
2.17.1Signature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Adrian Hunter
reviewerPATCH 2/3 perf intel-pt: Fix displaying PEBS-via-PT with registers
In reply to Adrian HunterAfter recording PEBS-via-PT, perf script will not accept 'iregs' field e.g.
# perf record -c 10000 -e '{intel_pt/branch=0/,branch-loads/aux-output/ppp}' -I -- ls -l
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.062 MB perf.data ]
# ./perf script --itrace=eop -F+iregs
Samples for 'dummy:u' event do not have IREGS attribute set. Cannot print 'iregs' field.Fix by using allow_user_set, which is true when recording AUX area data.
--- tools/perf/builtin-script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-script.c +1 -1
@@ -462,7 +462,7 @@ static int perf_evsel__check_attr(struct evsel *evsel, struct perf_session *sessreturn -EINVAL ;if (PRINT_FIELD (IREGS ) && -evsel__check_stype (evsel,PERF_SAMPLE_REGS_INTR ,"IREGS" ,PERF_OUTPUT_IREGS )) +evsel__do_check_stype (evsel,PERF_SAMPLE_REGS_INTR ,"IREGS" ,PERF_OUTPUT_IREGS , allow_user_set))return -EINVAL ; if (PRINT_FIELD(UREGS) &&
Signature · 1 line
2.17.1
Adrian Hunter
reviewerPATCH 3/3 perf intel-pt: Fix PEBS sample for XMM registers
In reply to Adrian HunterThe condition to add XMM registers was missing, the regs array needed to be in the outer scope, and the size of the regs array was too small.
--- tools/perf/util/intel-pt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt.c +3 -2
@@ -1735,6 +1735,7 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq)u64 sample_type = evsel->core.attr.sample_type;u64 id = evsel->core.id[0 ];u8 cpumode; +u64 regs[8 *sizeof (sample.intr_regs.mask)];if (intel_pt_skip_event (pt))return 0 ;
@@ -1784,8 +1785,8 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) }if (sample_type &PERF_SAMPLE_REGS_INTR && - items->mask[INTEL_PT_GP_REGS_POS ]) { -u64 regs[sizeof (sample.intr_regs.mask)]; + (items->mask[INTEL_PT_GP_REGS_POS ] || + items->mask[INTEL_PT_XMM_POS ])) {u64 regs_mask = evsel->core.attr.sample_regs_intr;u64 *pos;
Signature · 1 line
2.17.1