perf report: Support annotation of code without symbols
v2 cover perf report: Support annotation of code without symbols
For perf report on stripped binaries it is currently impossible to do annotation. The annotation state is all tied to symbols, but there are either no symbols, or symbols are not covering all the code.
We should support the annotation functionality even without symbols.
The first patch uses al_addr to print because it's easy to dump the instructions from this address in binary for branch mode.
The second patch supports the annotation on stripped binary.
v2:
---
Fix a crash issue when annotating an address in "unknown" object.
Jin Yao (2):
perf util: Print al_addr when symbol is not found
perf annotate: Support interactive annotation of code without symbols
tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ tools/perf/util/sort.c | 6 ++-- 3 files changed, 50 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 perf util: Print al_addr when symbol is not found
For branch mode, if the symbol is not found, it prints the address.
For example, 0x0000555eee0365a0 in below output.
Overhead Command Source Shared Object Source Symbol Target Symbol 17.55% div libc-2.27.so [.] __random [.] __random 6.11% div div [.] 0x0000555eee0365a0 [.] rand 6.10% div libc-2.27.so [.] rand [.] 0x0000555eee036769 5.80% div libc-2.27.so [.] __random_r [.] __random 5.72% div libc-2.27.so [.] __random [.] __random_r 5.62% div libc-2.27.so [.] __random_r [.] __random_r 5.38% div libc-2.27.so [.] __random [.] rand 4.56% div libc-2.27.so [.] __random [.] __random 4.49% div div [.] 0x0000555eee036779 [.] 0x0000555eee0365ff 4.25% div div [.] 0x0000555eee0365fa [.] 0x0000555eee036760
But it's not very easy to understand what the instructions are in the binary. So this patch uses the al_addr instead.
With this patch, the output is
Overhead Command Source Shared Object Source Symbol Target Symbol 17.55% div libc-2.27.so [.] __random [.] __random 6.11% div div [.] 0x00000000000005a0 [.] rand 6.10% div libc-2.27.so [.] rand [.] 0x0000000000000769 5.80% div libc-2.27.so [.] __random_r [.] __random 5.72% div libc-2.27.so [.] __random [.] __random_r 5.62% div libc-2.27.so [.] __random_r [.] __random_r 5.38% div libc-2.27.so [.] __random [.] rand 4.56% div libc-2.27.so [.] __random [.] __random 4.49% div div [.] 0x0000000000000779 [.] 0x00000000000005ff 4.25% div div [.] 0x00000000000005fa [.] 0x0000000000000760
Now we can use objdump to dump the object starting from 0x5a0.
For example,
objdump -d --start-address 0x5a0 div
00000000000005a0 <rand@plt>:
5a0: ff 25 2a 0a 20 00 jmpq *0x200a2a(%rip) # 200fd0 <__cxa_finalize@plt+0x200a20> 5a6: 68 02 00 00 00 pushq $0x2 5ab: e9 c0 ff ff ff jmpq 570 <srand@plt-0x10>
...
v2:
---
No change
--- tools/perf/util/sort.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/sort.c +4 -2
@@ -869,7 +869,8 @@ static int hist_entry__sym_from_snprintf(struct hist_entry *he, char *bf,if (he->branch_info) {struct addr_map_symbol *from = &he->branch_info->from; -return _hist_entry__sym_snprintf (&from->ms, from->addr, he->level, bf, size, width); +return _hist_entry__sym_snprintf (&from->ms, from->al_addr, + he->level, bf, size, width); }return repsep_snprintf (bf, size,"%-*.*s" , width, width,"N/A" );
@@ -881,7 +882,8 @@ static int hist_entry__sym_to_snprintf(struct hist_entry *he, char *bf,if (he->branch_info) {struct addr_map_symbol *to = &he->branch_info->to; -return _hist_entry__sym_snprintf (&to->ms, to->addr, he->level, bf, size, width); +return _hist_entry__sym_snprintf (&to->ms, to->al_addr, + he->level, bf, size, width); }return repsep_snprintf (bf, size,"%-*.*s" , width, width,"N/A" );
Signature · 1 line
2.17.1
PATCH v2 2/2 perf annotate: Support interactive annotation of code without symbols
In reply to Jin YaoFor perf report on stripped binaries it is currently impossible to do annotation. The annotation state is all tied to symbols, but there are either no symbols, or symbols are not covering all the code.
We should support the annotation functionality even without symbols.
This patch fakes a symbol and the symbol name is the string of address. After that, we just follow current annotation working flow.
For example,
1. perf report
Overhead Command Shared Object Symbol 20.67% div libc-2.27.so [.] __random_r 17.29% div libc-2.27.so [.] __random 10.59% div div [.] 0x0000000000000628 9.25% div div [.] 0x0000000000000612 6.11% div div [.] 0x0000000000000645
2. Select the line of "10.59% div div [.] 0x0000000000000628" and ENTER.
Annotate 0x0000000000000628
Zoom into div thread
Zoom into div DSO (use the 'k' hotkey to zoom directly into the kernel) Browse map details
Run scripts for samples of symbol [0x0000000000000628]
Run scripts for all samples
Switch to another data file in PWD
Exit
3. Select the "Annotate 0x0000000000000628" and ENTER.
Percent│
│
│
│ Disassembly of section .text:
│
│ 0000000000000628 <.text+0x68>:
│ divsd %xmm4,%xmm0
│ divsd %xmm3,%xmm1
│ movsd (%rsp),%xmm2
│ addsd %xmm1,%xmm0
│ addsd %xmm2,%xmm0
│ movsd %xmm0,(%rsp)Now we can see the dump of object starting from 0x628.
v2:
---
Fix a crash issue when annotating an address in "unknown" object.
The steps to reproduce this issue:
perf record -e cycles:u ls
perf report
75.29% ls ld-2.27.so [.] do_lookup_x
23.64% ls ld-2.27.so [.] __GI___tunables_init
1.04% ls [unknown] [k] 0xffffffff85c01210
0.03% ls ld-2.27.so [.] _start When annotating 0xffffffff85c01210, the crash happens.
v2 adds checking for ms->map in add_annotate_opt(). If the object is "unknown", ms->map is NULL.
--- tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)
tools/perf/ui/browsers/hists.c +44 -7
@@ -2465,13 +2465,47 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)return 0 ; } +static struct symbol *new_annotate_sym (u64 addr,struct map *map, +struct annotation_options *opts) +{ +struct symbol *sym; +struct annotated_source *src; +char name[64 ]; + +snprintf (name,sizeof (name),"%-#.*lx" ,BITS_PER_LONG /4 , addr); + + sym =symbol__new (addr, + opts->annotate_dummy_len ? + opts->annotate_dummy_len :ANNOTATION_DUMMY_LEN , +0 ,0 , name); +if (sym) { + src =symbol__hists (sym,1 ); +if (!src) { +symbol__delete (sym); +return NULL ; + } + +dso__insert_symbol (map->dso, sym); + } + +return sym; +} +static int -add_annotate_opt (struct hist_browser *browser__maybe_unused , +add_annotate_opt (struct hist_browser *browser,struct popup_action *act,char **optstr, -struct map_symbol *ms) +struct map_symbol *ms, +u64 addr) { -if (ms->sym ==NULL || ms->map->dso->annotate_warned || -symbol__annotation (ms->sym)->src ==NULL ) +if (!ms->map || !ms->map->dso || ms->map->dso->annotate_warned) +return 0 ; + +if (!ms->sym) { + ms->sym =new_annotate_sym (addr, ms->map, + browser->annotation_opts); + } + +if (ms->sym ==NULL ||symbol__annotation (ms->sym)->src ==NULL )return 0 ;if (asprintf (optstr,"Annotate %s" , ms->sym->name) <0 )
@@ -3219,17 +3253,20 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, nr_options +=add_annotate_opt (browser, &actions[nr_options], &options[nr_options], - &bi->from.ms); + &bi->from.ms, + bi->from.al_addr);if (bi->to.ms.sym != bi->from.ms.sym) nr_options +=add_annotate_opt (browser, &actions[nr_options], &options[nr_options], - &bi->to.ms); + &bi->to.ms, + bi->to.al_addr); }else { nr_options +=add_annotate_opt (browser, &actions[nr_options], &options[nr_options], - browser->selection); + browser->selection, + browser->he_selection->ip); } skip_annotation: nr_options += add_thread_opt(browser, &actions[nr_options],
tools/perf/util/annotate.h +2 -0
@@ -74,6 +74,7 @@ bool ins__is_fused(struct arch *arch, const char *ins1, const char *ins2);#define ANNOTATION__CYCLES_WIDTH 6#define ANNOTATION__MINMAX_CYCLES_WIDTH 19#define ANNOTATION__AVG_IPC_WIDTH 36 +#define ANNOTATION_DUMMY_LEN 256struct annotation_options { bool hide_src_code,
@@ -97,6 +98,7 @@ struct annotation_options {const char *prefix;const char *prefix_strip;unsigned int percent_type; +int annotate_dummy_len; };enum {
Signature · 1 line
2.17.1
Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols
On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
SNIP
Quoted 17 lines
Signed-off-by Jin Yao <[email protected]>--- tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)tools/perf/ui/browsers/hists.c +2
-0@@ -2465,13 +2465,47 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)return 0 ; } +static struct symbol *new_annotate_sym (u64 addr,struct map *map, +struct annotation_options *opts)
tools/perf/ui/browsers/hists.c do_annotate(struct hist_browser *browser, struct popup_action *act) · line 2479
Quoted 10 lines
tools/perf/ui/browsers/hists.c +10
-0+{ +struct symbol *sym; +struct annotated_source *src; +char name[64 ]; + +snprintf (name,sizeof (name),"%-#.*lx" ,BITS_PER_LONG /4 , addr); + + sym = symbol__new(addr, + opts->annotate_dummy_len ? + opts->annotate_dummy_len : ANNOTATION_DUMMY_LEN,
I can't see annotate_dummy_len being set anywhere..
jirka
Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols
Quoted 19 lines · Jiri Olsa
On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
SNIP
Quoted 15 lines
Signed-off-by Jin Yao <[email protected]>--- tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)tools/perf/ui/browsers/hists.c +0
-0@@ -2465,13 +2465,47 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)return 0 ; }
Quoted 15 lines
tools/perf/ui/browsers/hists.c do_annotate(struct hist_browser *browser, struct popup_action *act) · line 2479
Quoted 12 lines
tools/perf/ui/browsers/hists.c +12
-0+static struct symbol *new_annotate_sym (u64 addr,struct map *map, +struct annotation_options *opts) +{ +struct symbol *sym; +struct annotated_source *src; +char name[64 ]; + +snprintf (name,sizeof (name),"%-#.*lx" ,BITS_PER_LONG /4 , addr); + + sym = symbol__new(addr, + opts->annotate_dummy_len ? + opts->annotate_dummy_len : ANNOTATION_DUMMY_LEN,I can't see
annotate_dummy_lenbeing set anywhere..
Yes, annotate_dummy_len is not set in this patch. Currently we just use the default value. While maybe in future we will provide a perf report option or set it in perf config. Now I just leave an interface here.
Thanks
Jin Yao
Quoted 2 lines
jirka
Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols
Quoted 37 lines · Yao
Quoted 24 lines · Jiri Olsa
On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
SNIP
Quoted 20 lines
Signed-off-by Jin Yao <[email protected]>--- tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)tools/perf/ui/browsers/hists.c +6
-0@@ -2465,13 +2465,47 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)return 0 ; } +static struct symbol *new_annotate_sym (u64 addr,struct map *map, +struct annotation_options *opts) +{ +struct symbol *sym; +struct annotated_source *src; +char name[64 ];Quoted 9 lines
tools/perf/ui/browsers/hists.c do_annotate(struct hist_browser *browser, struct popup_action *act) · line 2479
Quoted 6 lines
tools/perf/ui/browsers/hists.c +6
-0+ +snprintf (name,sizeof (name),"%-#.*lx" ,BITS_PER_LONG /4 , addr); + + sym = symbol__new(addr, + opts->annotate_dummy_len ? + opts->annotate_dummy_len : ANNOTATION_DUMMY_LEN,I can't see
annotate_dummy_lenbeing set anywhere..
Quoted 3 lines
Yes,
annotate_dummy_lenis not set in this patch. Currently we just use the default value. While maybe in future we will provide a perf report option or set it in perf config. Now I just leave an interface here.
if that's just 'maybe in future we will provide' then please keep just the ANNOTATION_DUMMY_LEN, the abandoned opts->annotate_dummy_len var is confusing
thanks,
jirka
Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols
Quoted 42 lines · Jiri Olsa
Quoted 37 lines · Yao
Quoted 24 lines · Jiri Olsa
On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
SNIP
Quoted 20 lines
Signed-off-by Jin Yao <[email protected]>--- tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++----- tools/perf/util/annotate.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)tools/perf/ui/browsers/hists.c +6
-0@@ -2465,13 +2465,47 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)return 0 ; } +static struct symbol *new_annotate_sym (u64 addr,struct map *map, +struct annotation_options *opts) +{ +struct symbol *sym; +struct annotated_source *src; +char name[64 ];Quoted 9 lines
tools/perf/ui/browsers/hists.c do_annotate(struct hist_browser *browser, struct popup_action *act) · line 2479
Quoted 6 lines
tools/perf/ui/browsers/hists.c +6
-0+ +snprintf (name,sizeof (name),"%-#.*lx" ,BITS_PER_LONG /4 , addr); + + sym = symbol__new(addr, + opts->annotate_dummy_len ? + opts->annotate_dummy_len : ANNOTATION_DUMMY_LEN,I can't see
annotate_dummy_lenbeing set anywhere..Quoted 3 lines
Yes,
annotate_dummy_lenis not set in this patch. Currently we just use the default value. While maybe in future we will provide a perf report option or set it in perf config. Now I just leave an interface here.
Quoted 6 lines
if that's just 'maybe in future we will provide' then please keep just the
ANNOTATION_DUMMY_LEN, the abandonedopts->annotate_dummy_lenvar is confusingthanks,
jirka
OK, I will keep just the ANNOTATION_DUMMY_LEN and remove the opts->annotate_dummy_len in next version.
Thanks
Jin Yao