* [PATCH 1/2] perf script: Fix brstackinsn for AUXTRACE
@ 2019-11-27 9:53 Adrian Hunter
2019-11-27 15:18 ` Arnaldo Carvalho de Melo
2019-11-29 6:02 ` [tip: perf/urgent] " tip-bot2 for Adrian Hunter
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Hunter @ 2019-11-27 9:53 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Jiri Olsa, linux-kernel, Andi Kleen
brstackinsn must be allowed to be set by the user when AUX area data has
been captured because, in that case, the branch stack might be
synthesized on the fly. This fixes the following error:
Before:
$ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
[ perf record: Woken up 19 times to write data ]
[ perf record: Captured and wrote 2.274 MB perf.data ]
$ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
Display of branch stack assembler requested, but non all-branch filter set
Hint: run 'perf record -b ...'
After:
$ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
[ perf record: Woken up 19 times to write data ]
[ perf record: Captured and wrote 2.274 MB perf.data ]
$ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
grep 13759 [002] 8091.310257: 1862 instructions:uH: 5641d58069eb bmexec+0x86b (/bin/grep)
bmexec+2485:
00005641d5806b35 jnz 0x5641d5806bd0 # MISPRED
00005641d5806bd0 movzxb (%r13,%rdx,1), %eax
00005641d5806bd6 add %rdi, %rax
00005641d5806bd9 movzxb -0x1(%rax), %edx
00005641d5806bdd cmp %rax, %r14
00005641d5806be0 jnb 0x5641d58069c0 # MISPRED
mismatch of LBR data and executable
00005641d58069c0 movzxb (%r13,%rdx,1), %edi
Reported-by: Andi Kleen <ak@linux.intel.com>
Fixes: 48d02a1d5c13 ("perf script: Add 'brstackinsn' for branch stacks")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/builtin-script.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 7b2f0922050c..e8db26b9b29e 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -448,7 +448,7 @@ static int perf_evsel__check_attr(struct evsel *evsel,
"selected. Hence, no address to lookup the source line number.\n");
return -EINVAL;
}
- if (PRINT_FIELD(BRSTACKINSN) &&
+ if (PRINT_FIELD(BRSTACKINSN) && !allow_user_set &&
!(perf_evlist__combined_branch_type(session->evlist) &
PERF_SAMPLE_BRANCH_ANY)) {
pr_err("Display of branch stack assembler requested, but non all-branch filter set\n"
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] perf script: Fix brstackinsn for AUXTRACE
2019-11-27 9:53 [PATCH 1/2] perf script: Fix brstackinsn for AUXTRACE Adrian Hunter
@ 2019-11-27 15:18 ` Arnaldo Carvalho de Melo
2019-11-29 6:02 ` [tip: perf/urgent] " tip-bot2 for Adrian Hunter
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-11-27 15:18 UTC (permalink / raw)
To: Adrian Hunter; +Cc: Jiri Olsa, linux-kernel, Andi Kleen
Em Wed, Nov 27, 2019 at 11:53:21AM +0200, Adrian Hunter escreveu:
> brstackinsn must be allowed to be set by the user when AUX area data has
> been captured because, in that case, the branch stack might be
> synthesized on the fly. This fixes the following error:
>
> Before:
>
> $ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
> [ perf record: Woken up 19 times to write data ]
> [ perf record: Captured and wrote 2.274 MB perf.data ]
> $ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
> Display of branch stack assembler requested, but non all-branch filter set
> Hint: run 'perf record -b ...'
>
> After:
>
> $ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
> [ perf record: Woken up 19 times to write data ]
> [ perf record: Captured and wrote 2.274 MB perf.data ]
> $ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
> grep 13759 [002] 8091.310257: 1862 instructions:uH: 5641d58069eb bmexec+0x86b (/bin/grep)
> bmexec+2485:
> 00005641d5806b35 jnz 0x5641d5806bd0 # MISPRED
> 00005641d5806bd0 movzxb (%r13,%rdx,1), %eax
> 00005641d5806bd6 add %rdi, %rax
> 00005641d5806bd9 movzxb -0x1(%rax), %edx
> 00005641d5806bdd cmp %rax, %r14
> 00005641d5806be0 jnb 0x5641d58069c0 # MISPRED
> mismatch of LBR data and executable
> 00005641d58069c0 movzxb (%r13,%rdx,1), %edi
Thanks, applied.
- Arnaldo
> Reported-by: Andi Kleen <ak@linux.intel.com>
> Fixes: 48d02a1d5c13 ("perf script: Add 'brstackinsn' for branch stacks")
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/builtin-script.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index 7b2f0922050c..e8db26b9b29e 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -448,7 +448,7 @@ static int perf_evsel__check_attr(struct evsel *evsel,
> "selected. Hence, no address to lookup the source line number.\n");
> return -EINVAL;
> }
> - if (PRINT_FIELD(BRSTACKINSN) &&
> + if (PRINT_FIELD(BRSTACKINSN) && !allow_user_set &&
> !(perf_evlist__combined_branch_type(session->evlist) &
> PERF_SAMPLE_BRANCH_ANY)) {
> pr_err("Display of branch stack assembler requested, but non all-branch filter set\n"
> --
> 2.17.1
--
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip: perf/urgent] perf script: Fix brstackinsn for AUXTRACE
2019-11-27 9:53 [PATCH 1/2] perf script: Fix brstackinsn for AUXTRACE Adrian Hunter
2019-11-27 15:18 ` Arnaldo Carvalho de Melo
@ 2019-11-29 6:02 ` tip-bot2 for Adrian Hunter
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Adrian Hunter @ 2019-11-29 6:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: Andi Kleen, Adrian Hunter, Jiri Olsa, Arnaldo Carvalho de Melo,
x86, LKML
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 0cd032d3b5fcebf5454315400ab310746a81ca53
Gitweb: https://git.kernel.org/tip/0cd032d3b5fcebf5454315400ab310746a81ca53
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Wed, 27 Nov 2019 11:53:21 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Thu, 28 Nov 2019 08:08:38 -03:00
perf script: Fix brstackinsn for AUXTRACE
brstackinsn must be allowed to be set by the user when AUX area data has
been captured because, in that case, the branch stack might be
synthesized on the fly. This fixes the following error:
Before:
$ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
[ perf record: Woken up 19 times to write data ]
[ perf record: Captured and wrote 2.274 MB perf.data ]
$ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
Display of branch stack assembler requested, but non all-branch filter set
Hint: run 'perf record -b ...'
After:
$ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot
[ perf record: Woken up 19 times to write data ]
[ perf record: Captured and wrote 2.274 MB perf.data ]
$ perf script -F +brstackinsn --xed --itrace=i1usl100 | head
grep 13759 [002] 8091.310257: 1862 instructions:uH: 5641d58069eb bmexec+0x86b (/bin/grep)
bmexec+2485:
00005641d5806b35 jnz 0x5641d5806bd0 # MISPRED
00005641d5806bd0 movzxb (%r13,%rdx,1), %eax
00005641d5806bd6 add %rdi, %rax
00005641d5806bd9 movzxb -0x1(%rax), %edx
00005641d5806bdd cmp %rax, %r14
00005641d5806be0 jnb 0x5641d58069c0 # MISPRED
mismatch of LBR data and executable
00005641d58069c0 movzxb (%r13,%rdx,1), %edi
Fixes: 48d02a1d5c13 ("perf script: Add 'brstackinsn' for branch stacks")
Reported-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20191127095322.15417-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-script.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 7b2f092..e8db26b 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -448,7 +448,7 @@ static int perf_evsel__check_attr(struct evsel *evsel,
"selected. Hence, no address to lookup the source line number.\n");
return -EINVAL;
}
- if (PRINT_FIELD(BRSTACKINSN) &&
+ if (PRINT_FIELD(BRSTACKINSN) && !allow_user_set &&
!(perf_evlist__combined_branch_type(session->evlist) &
PERF_SAMPLE_BRANCH_ANY)) {
pr_err("Display of branch stack assembler requested, but non all-branch filter set\n"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-29 6:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-27 9:53 [PATCH 1/2] perf script: Fix brstackinsn for AUXTRACE Adrian Hunter
2019-11-27 15:18 ` Arnaldo Carvalho de Melo
2019-11-29 6:02 ` [tip: perf/urgent] " tip-bot2 for Adrian Hunter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.