[PATCH v2 0/2] perf report: Support annotation of code without symbols

[PATCH v2 0/2] perf report: Support annotation of code without symbols

[Jin Yao]

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(-)

-- 
2.17.1

[PATCH v2 1/2] perf util: Print al_addr when symbol is not found

[Jin Yao]

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

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
 tools/perf/util/sort.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index ab0cfd790ad0..e860595576c2 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -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");
-- 
2.17.1

[PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols

[Jin Yao]

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.

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.

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
 tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++-----
 tools/perf/util/annotate.h     |  2 ++
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index f36dee499320..5144528b2931 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -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],
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 455403e8fede..40ca4b58cd17 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -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	256
 
 struct 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 {
-- 
2.17.1

Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols

[Jiri Olsa]

On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:

SNIP

> 
> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> ---
>  tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++-----
>  tools/perf/util/annotate.h     |  2 ++
>  2 files changed, 46 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index f36dee499320..5144528b2931 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -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,

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

[Jin, Yao]

On 2/21/2020 10:45 PM, Jiri Olsa wrote:
> On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
> 
> SNIP
> 
>>
>> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
>> ---
>>   tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++-----
>>   tools/perf/util/annotate.h     |  2 ++
>>   2 files changed, 46 insertions(+), 7 deletions(-)
>>
>> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
>> index f36dee499320..5144528b2931 100644
>> --- a/tools/perf/ui/browsers/hists.c
>> +++ b/tools/perf/ui/browsers/hists.c
>> @@ -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,
> 
> I can't see annotate_dummy_len being 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

> jirka
> 

Re: [PATCH v2 2/2] perf annotate: Support interactive annotation of code without symbols

[Jiri Olsa]

On Sat, Feb 22, 2020 at 07:37:49AM +0800, Jin, Yao wrote:
> 
> 
> On 2/21/2020 10:45 PM, Jiri Olsa wrote:
> > On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
> > 
> > SNIP
> > 
> > > 
> > > Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> > > ---
> > >   tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++-----
> > >   tools/perf/util/annotate.h     |  2 ++
> > >   2 files changed, 46 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> > > index f36dee499320..5144528b2931 100644
> > > --- a/tools/perf/ui/browsers/hists.c
> > > +++ b/tools/perf/ui/browsers/hists.c
> > > @@ -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,
> > 
> > I can't see annotate_dummy_len being 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.

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

[Jin, Yao]

On 2/24/2020 3:50 AM, Jiri Olsa wrote:
> On Sat, Feb 22, 2020 at 07:37:49AM +0800, Jin, Yao wrote:
>>
>>
>> On 2/21/2020 10:45 PM, Jiri Olsa wrote:
>>> On Fri, Feb 21, 2020 at 10:46:08AM +0800, Jin Yao wrote:
>>>
>>> SNIP
>>>
>>>>
>>>> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
>>>> ---
>>>>    tools/perf/ui/browsers/hists.c | 51 +++++++++++++++++++++++++++++-----
>>>>    tools/perf/util/annotate.h     |  2 ++
>>>>    2 files changed, 46 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
>>>> index f36dee499320..5144528b2931 100644
>>>> --- a/tools/perf/ui/browsers/hists.c
>>>> +++ b/tools/perf/ui/browsers/hists.c
>>>> @@ -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,
>>>
>>> I can't see annotate_dummy_len being 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.
> 
> 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
> 

OK, I will keep just the ANNOTATION_DUMMY_LEN and remove the 
opts->annotate_dummy_len in next version.

Thanks
Jin Yao