perf, tools: Support srccode output
PATCH 1/1 perf, tools: Support srccode output
From: Andi Kleen <[email protected]>
When looking at PT or brstackinsn traces with perf script it can be very useful to see the source code. This adds a simple facility to print them with perf script, if the information is available through dwarf
% perf record ...
% perf script -F insn,ip,sym,srccode
...
4004c6 main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004c6 main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004cd main
5 for (i = 0; i < 10000000; i++)
4004b3 main6 v++;
% perf record -b ...
% perf script -F insn,ip,sym,srccode,brstackinsn
...
4004c6 main
main+39:
00000000004004cd insn: 7e e4 # PRED
5 for (i = 0; i < 10000000; i++)
00000000004004b3 insn: 8b 05 67 0b 20 00
6 v++;
00000000004004b9 insn: 83 c0 01
6 v++;
00000000004004bc insn: 89 05 5e 0b 20 00
6 v++;
00000000004004c2 insn: 83 45 fc 01
5 for (i = 0; i < 10000000; i++)
00000000004004c6 insn: 81 7d fc 7f 96 98 00
5 for (i = 0; i < 10000000; i++)
00000000004004cd insn: 7e e4 # PRED
5 for (i = 0; i < 10000000; i++)
00000000004004b3 insn: 8b 05 67 0b 20 00
6 v++;
00000000004004b9 insn: 83 c0 01
6 v++;
00000000004004bc insn: 89 05 5e 0b 20 00
6 v++;
00000000004004c2 insn: 83 45 fc 01
5 for (i = 0; i < 10000000; i++)
00000000004004c6 insn: 81 7d fc 7f 96 98 00
5 for (i = 0; i < 10000000; i++)
00000000004004cd insn: 7e e4 # PREDNot supported for callchains currently, would need some layout changes there.
--- tools/perf/Documentation/perf-script.txt | 3 +- tools/perf/builtin-script.c | 38 ++++++- tools/perf/util/Build | 1 + tools/perf/util/evsel_fprintf.c | 1 + tools/perf/util/map.c | 29 ++++++ tools/perf/util/map.h | 2 + tools/perf/util/srccode.c | 163 +++++++++++++++++++++++++++++++ tools/perf/util/srccode.h | 7 ++ 8 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 tools/perf/util/srccode.c create mode 100644 tools/perf/util/srccode.h
tools/perf/Documentation/perf-script.txt +2 -1
@@ -117,7 +117,8 @@ OPTIONS Comma separated list of fields to print. Options are: comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, srcline, period, iregs, brstack, brstacksym, flags, bpf-output, brstackinsn, - callindent, insn, insnlen. Field list can be prepended with the type, trace, sw or hw, + callindent, insn, insnlen, srccode. + Field list can be prepended with the type, trace, sw or hw, to indicate to which event type the field list applies. e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace
tools/perf/builtin-script.c +37 -1
@@ -85,6 +85,7 @@ enum perf_output_field {PERF_OUTPUT_INSN =1U <<21 ,PERF_OUTPUT_INSNLEN =1U <<22 ,PERF_OUTPUT_BRSTACKINSN =1U <<23 , + PERF_OUTPUT_SRCCODE = 1U << 24, }; struct output_option {
@@ -115,6 +116,7 @@ struct output_option { {.str = "insn", .field = PERF_OUTPUT_INSN}, {.str = "insnlen", .field = PERF_OUTPUT_INSNLEN}, {.str = "brstackinsn", .field = PERF_OUTPUT_BRSTACKINSN}, + {.str = "srccode", .field = PERF_OUTPUT_SRCCODE}, };/* default set to maintain compatibility with current format */
@@ -304,7 +306,7 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel, "to DSO.\n");return -EINVAL ; } -if (PRINT_FIELD (SRCLINE ) && !PRINT_FIELD (IP )) { +if ((PRINT_FIELD (SRCLINE ) ||PRINT_FIELD (SRCCODE )) && !PRINT_FIELD (IP )) {pr_err ("Display of source line number requested but sample IP is not\n" "selected. Hence, no address to lookup the source line number.\n" );return -EINVAL ;
@@ -633,6 +635,19 @@ static int grab_bb(u8 *buffer, u64 start, u64 end,return len; } +static void print_srccode (struct thread *thread,u8 cpumode,uint64_t addr) +{ +struct addr_location al; +memset (&al,0 ,sizeof (al)); + +thread__find_addr_map (thread, cpumode,MAP__FUNCTION , addr, &al); +if (!al.map) +thread__find_addr_map (thread, cpumode,MAP__VARIABLE , + addr, &al); +if (al.map &&map__fprintf_srccode (al.map, al.addr,"" , stdout)) +printf ("\n" ); +} +static void print_jump (uint64_t ip,struct branch_entry *en,struct perf_insn *x,u8 *inbuf,int len,int insn)
@@ -687,6 +702,7 @@ static void print_ip_sym(struct thread *thread, u8 cpumode, int cpu,if (PRINT_FIELD (SRCLINE ))map__fprintf_srcline (al.map, al.addr,"\t" , stdout);putchar ('\n' ); +/* Could print srccode here too */ *lastsym = al.sym; }
@@ -723,6 +739,8 @@ static void print_sample_brstackinsn(struct perf_sample *sample, br->entries[nr - 1].from, &lastsym, attr);print_jump (br->entries[nr -1 ].from, &br->entries[nr -1 ], &x, buffer, len,0 ); +if (PRINT_FIELD (SRCCODE )) +print_srccode (thread, x.cpumode, br->entries[nr -1 ].from); }/* Print all blocks */
@@ -751,12 +769,16 @@ static void print_sample_brstackinsn(struct perf_sample *sample,print_ip_sym (thread, x.cpumode, x.cpu, ip, &lastsym, attr);if (ip == end) {print_jump (ip, &br->entries[i], &x, buffer + off, len - off, insn); +if (PRINT_FIELD (SRCCODE )) +print_srccode (thread, x.cpumode, ip);break ; }else {printf ("\t%016" PRIx64"\t%s\n" , ip,dump_insn (&x, ip, buffer + off, len - off, &ilen));if (ilen ==0 )break ; +if (PRINT_FIELD (SRCCODE )) +print_srccode (thread, x.cpumode, ip); insn++; } }
@@ -787,6 +809,8 @@ static void print_sample_brstackinsn(struct perf_sample *sample,printf ("\t%016" PRIx64"\t%s\n" , sample->ip,dump_insn (&x, sample->ip, buffer, len,NULL )); +if (PRINT_FIELD (SRCCODE )) +print_srccode (thread, x.cpumode, sample->ip);return ; }for (off =0 ; off <= end - start; off += ilen) {
@@ -794,6 +818,8 @@ static void print_sample_brstackinsn(struct perf_sample *sample, dump_insn(&x, start + off, buffer + off, len - off, &ilen));if (ilen ==0 )break ; +if (PRINT_FIELD (SRCCODE )) +print_srccode (thread, x.cpumode, start + off); } }
@@ -947,6 +973,11 @@ static void print_sample_bts(struct perf_sample *sample,print_insn (sample, attr, thread, machine);printf ("\n" ); + +if (PRINT_FIELD (SRCCODE )) { +if (map__fprintf_srccode (al->map, al->addr,"" , stdout)) +printf ("\n" ); + } } static struct {
@@ -1195,6 +1226,11 @@ static void process_event(struct perf_script *script,print_sample_bpf_output (sample);print_insn (sample, attr, thread, machine);printf ("\n" ); + +if (PRINT_FIELD (SRCCODE )) { +if (map__fprintf_srccode (al->map, al->addr,"" , stdout)) +printf ("\n" ); + } }static struct scripting_ops *scripting_ops;
tools/perf/util/Build +1 -0
@@ -72,6 +72,7 @@ libperf-y += stat.o libperf-y += stat-shadow.o libperf-y += record.o libperf-y += srcline.o +libperf-y += srccode.o libperf-y += data.o libperf-y += tsc.o libperf-y += cloexec.o
tools/perf/util/evsel_fprintf.c +1 -0
@@ -168,6 +168,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (!print_oneline) printed +=fprintf (fp,"\n" ); +/* Add srccode here too? */ if (symbol_conf.bt_stop_list && node->sym && strlist__has_entry(symbol_conf.bt_stop_list,
tools/perf/util/map.c +29 -0
@@ -17,6 +17,7 @@#include <linux/string.h> #include "srcline.h" #include "unwind.h" +#include "srccode.h" static void __maps__insert (struct maps *maps,struct map *map);
@@ -414,6 +415,34 @@ int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix,return ret; } +int map__fprintf_srccode (struct map *map,u64 addr, +const char *prefix,FILE *fp) +{ +char *srcline; +int ret =0 ; + +if (map && map->dso) { + srcline_full_filename = true; + srcline =get_srcline (map->dso, +map__rip_2objdump (map, addr),NULL , + true, true); +if (srcline !=SRCLINE_UNKNOWN ) { +char srcfile[1024 ]; +int line, len; +char *srccode; +if (sscanf (srcline,"%1023[^:]:%d" , srcfile, &line) + ==2 && + (srccode =find_sourceline (srcfile, line, &len)) + !=NULL ) + ret =fprintf (fp,"%s%-8d %.*s" , + prefix, + line, len, srccode); +free_srcline (srcline); + } + } +return ret; +} +/** * map__rip_2objdump - convert symbol start address to objdump address. * @map: memory map
tools/perf/util/map.h +2 -0
@@ -169,6 +169,8 @@ size_t map__fprintf(struct map *map, FILE *fp);size_t map__fprintf_dsoname (struct map *map,FILE *fp);int map__fprintf_srcline (struct map *map,u64 addr,const char *prefix,FILE *fp); +int map__fprintf_srccode (struct map *map,u64 addr,const char *prefix, +FILE *fp);int map__load (struct map *map);struct symbol *map__find_symbol (struct map *map,u64 addr);
tools/perf/util/srccode.c new file +163 -0
163 lines not on this page · raw message
tools/perf/util/srccode.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef SRCLINE_H +#define SRCLINE_H 1 + +/* Result is not 0 terminated */ +char *find_sourceline (char *fn,unsigned line,int *lenp); + +#endif
Signature · 1 line
2.9.3
On Fri, May 05, 2017 at 04:00:29PM -0700, Andi Kleen wrote:
SNIP
Quoted 34 lines
tools/perf/util/srccode.c new file +34
-0+static struct srcfile *find_srcfile (char *fn) +{ +struct stat st; +struct srcfile *h; +int fd; +unsigned long ps, sz; +bool first = true; + + list_for_each_entry (h, &srcfile_list, nd) { +if (!strcmp (fn, h->fn)) { +if (!first) { +/* Move to front */ +list_del (&h->nd); +list_add (&h->nd, &srcfile_list); + } +return h; + } + first = false; + } + +/* Only prune if there is more than one entry */ +while (map_total_sz >MAXSRCCACHE && + srcfile_list.next != &srcfile_list) { +assert (!list_empty (&srcfile_list)); + h = list_entry(srcfile_list.prev, struct srcfile, nd); +free_srcfile (h); + } + + fd =open (fn,O_RDONLY ); +if (fd <0 ||fstat (fd, &st) <0 ) { +pr_debug ("cannot open source file %s\n" , fn); +return NULL ; + } +
tools/perf/util/srccode.c line 121
Quoted 10 lines
tools/perf/util/srccode.c new file +10
-0+ h =malloc (sizeof (struct srcfile )); +if (!h) +return NULL ; + + h->fn =strdup (fn); +if (!h->fn) + goto out_h; + + h->maplen = st.st_size; + ps =sysconf (_SC_PAGE_SIZE);
we have global page_size
jirka
On Fri, May 05, 2017 at 04:00:29PM -0700, Andi Kleen wrote:
SNIP
Quoted 7 lines
tools/perf/util/map.c +6
-0+int map__fprintf_srccode (struct map *map,u64 addr, +const char *prefix,FILE *fp) +{ +char *srcline; +int ret =0 ; +
tools/perf/util/map.c int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix, · line 433
Quoted 10 lines
tools/perf/util/map.c +10
-0+if (map && map->dso) { + srcline_full_filename = true; + srcline =get_srcline (map->dso, +map__rip_2objdump (map, addr),NULL , + true, true); +if (srcline !=SRCLINE_UNKNOWN ) { +char srcfile[1024 ]; +int line, len; +char *srccode; + if (sscanf(srcline, "%1023[^:]:%d", srcfile, &line)
so get_srcline formats srcline and you parse it out back in here, I think it'd be better to factor __get_srcline and get the file and line directly
thanks,
jirka
Quoted 3 lines
so
get_srclineformats srcline and you parse it out back in here, I think it'd be better to factor__get_srclineand get the file and line directly
It's not true for the addr2line fallback which gets the already formatted string. So at some point it would need to be parsed.
But ok I can move it into the low level function. It just makes the patch more complicated.
-Andi