perf script: Have consistent output for symbol address
v3 cover perf script: Have consistent output for symbol address
The goal of this change is to achieve consistent output for symbol address. Before this, the raw ip is printed for non-callchain and dso offset for callchain. Mostly what we expect is the raw ip.
This patch does two changes:
- Always print raw ip for resolved symbols.
- Add a new 'dsoff' field if we really need the dso offset, and the offset is appended to dso name.
v3:
o 'dsoff' implys 'dso' field. (Namhyung)
v2:
o split into two patches. (Adrian)
o do not print offset for unresolved symbols. (Adrian)
Changbin Du (2):
perf script: print raw ip instead of binary offset for callchain
perf: script: add new output field 'dsoff' to print dso offset
tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 9 ++++++++- tools/perf/util/evsel_fprintf.c | 15 ++++++++------- tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 18 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/2 perf script: print raw ip instead of binary offset for callchain
Before this, the raw ip is printed for non-callchain and dso offset for callchain. This inconsistent output for address may confuse people. And mostly what we expect is the raw ip.
'dso offset' is printed in callchain:
$ perf script
...
ls 1341034 2739463.008343: 2162417 cycles:
ffffffff99d657a7 [unknown] ([unknown])
ffffffff99e00b67 [unknown] ([unknown])
235d3 memset+0x53 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) # dso offset
a61b _dl_map_object+0x1bb (/usr/lib/x86_64-linux-gnu/ld-2.31.so)raw ip is printed for non-callchain:
$ perf script -G
...
ls 1341034 2739463.008876: 2053304 cycles: ffffffffc1596923 [unknown] ([unknown])
ls 1341034 2739463.009381: 1917049 cycles: 14def8e149e6 __strcoll_l+0xd96 (/usr/lib/x86_64-linux-gnu/libc-2.31.so) # raw ipLet's have consistent output for it. Later I'll add a new field 'dsoff' to print dso offset.
--- tools/perf/util/evsel_fprintf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
tools/perf/util/evsel_fprintf.c +2 -7
@@ -153,13 +153,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (map) addr = map->map_ip (map, node->ip); -if (print_ip) { -/* Show binary offset for userspace addr */ -if (map && !map->dso->kernel) - printed +=fprintf (fp,"%c%16" PRIx64, s, addr); -else - printed +=fprintf (fp,"%c%16" PRIx64, s, node->ip); - } +if (print_ip) + printed +=fprintf (fp,"%c%16" PRIx64, s, node->ip);if (print_sym) { printed +=fprintf (fp," " );
Signature · 1 line
2.25.1
Adrian Hunter
reviewerRe: [PATCH v3 1/2] perf script: print raw ip instead of binary offset for callchain
Quoted 3 lines · Changbin Du
Before this, the raw ip is printed for non-callchain and dso offset for callchain. This inconsistent output for address may confuse people. And mostly what we expect is the raw ip.
This patch does not apply anymore, refer:
https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/log/?h=perf-tools-next
Quoted 44 lines
'dso offset' is printed in callchain:
$ perf script ... ls 1341034 2739463.008343: 2162417 cycles: ffffffff99d657a7 [unknown] ([unknown]) ffffffff99e00b67 [unknown] ([unknown]) 235d3 memset+0x53 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) # dso offset a61b _dl_map_object+0x1bb (/usr/lib/x86_64-linux-gnu/ld-2.31.so)raw ip is printed for non-callchain:
$ perf script -G ... ls 1341034 2739463.008876: 2053304 cycles: ffffffffc1596923 [unknown] ([unknown]) ls 1341034 2739463.009381: 1917049 cycles: 14def8e149e6 __strcoll_l+0xd96 (/usr/lib/x86_64-linux-gnu/libc-2.31.so) # raw ipLet's have consistent output for it. Later I'll add a new field 'dsoff' to print dso offset.
Signed-off-by Changbin Du <[email protected]>--- tools/perf/util/evsel_fprintf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)tools/perf/util/evsel_fprintf.c +2
-7@@ -153,13 +153,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (map) addr = map->map_ip (map, node->ip); -if (print_ip) { -/* Show binary offset for userspace addr */ -if (map && !map->dso->kernel) - printed +=fprintf (fp,"%c%16" PRIx64, s, addr); -else - printed +=fprintf (fp,"%c%16" PRIx64, s, node->ip); - } +if (print_ip) + printed +=fprintf (fp,"%c%16" PRIx64, s, node->ip);if (print_sym) { printed +=fprintf (fp," " );
PATCH v3 2/2 perf: script: add new output field 'dsoff' to print dso offset
In reply to Changbin DuThis adds a new 'dsoff' field to print dso offset for resolved symbols, and the offset is appended to dso name.
Default output:
$ perf script
ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so)
ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown])
ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown])
ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1)Display 'dsoff' field:
$ perf script -F +dsoff
ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so+0x1c4b5)
ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown])
ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown])
ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown])
ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1+0x68d0)
ls 2695501 3011030.487019: 500000 cycles: ffffffff992a6db0 [unknown] ([unknown])--- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 9 ++++++++- tools/perf/util/evsel_fprintf.c | 6 ++++++ tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 16 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-script.txt +1 -1
@@ -130,7 +130,7 @@ OPTIONS -F:: --fields:: Comma separated list of fields to print. Options are: - comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr, symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth, phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat,
tools/perf/builtin-script.c +8 -1
@@ -133,6 +133,7 @@ enum perf_output_field {PERF_OUTPUT_VCPU =1ULL <<38 ,PERF_OUTPUT_CGROUP =1ULL <<39 ,PERF_OUTPUT_RETIRE_LAT =1ULL <<40 , + PERF_OUTPUT_DSOFF = 1ULL << 41, }; struct perf_script {
@@ -174,6 +175,7 @@ struct output_option { {.str = "ip", .field = PERF_OUTPUT_IP}, {.str = "sym", .field = PERF_OUTPUT_SYM}, {.str = "dso", .field = PERF_OUTPUT_DSO}, + {.str = "dsoff", .field = PERF_OUTPUT_DSOFF}, {.str = "addr", .field = PERF_OUTPUT_ADDR}, {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET}, {.str = "srcline", .field = PERF_OUTPUT_SRCLINE},
@@ -574,6 +576,11 @@ static void set_print_ip_opts(struct perf_event_attr *attr)if (PRINT_FIELD (DSO )) output[type].print_ip_opts |=EVSEL__PRINT_DSO ; +if (PRINT_FIELD (DSOFF )) { +/* 'dsoff' implys 'dso' field for printing */ + output[type].print_ip_opts |=EVSEL__PRINT_DSO |EVSEL__PRINT_DSOFF ; + } +if (PRINT_FIELD (SYMOFFSET )) output[type].print_ip_opts |=EVSEL__PRINT_SYMOFFSET ;
@@ -3881,7 +3888,7 @@ int cmd_script(int argc, const char **argv)"comma separated output fields prepend with 'type:'. " "+field to add and -field to remove." "Valid types: hw,sw,trace,raw,synth. " -"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," +"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff" "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth,"
tools/perf/util/evsel_fprintf.c +6 -0
@@ -116,6 +116,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_oneline = print_opts &EVSEL__PRINT_ONELINE ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;
@@ -174,6 +175,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (print_dso && (!sym || !sym->inlined)) { printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (map, fp); +if (print_dsoff && map && map->dso) + printed +=fprintf (fp,"+0x%lx" , addr); printed +=fprintf (fp,")" ); }
@@ -209,6 +212,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;int print_unknown_as_addr = print_opts &EVSEL__PRINT_UNKNOWN_AS_ADDR ;
@@ -237,6 +241,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,if (print_dso) { printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (al->map, fp); +if (print_dsoff && al->map && al->map->dso) + printed +=fprintf (fp,"+0x%lx" , al->addr); printed +=fprintf (fp,")" ); }
tools/perf/util/evsel_fprintf.h +1 -0
@@ -26,6 +26,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE#define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6)#define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7)#define EVSEL__PRINT_SKIP_IGNORED (1<<8) +#define EVSEL__PRINT_DSOFF (1<<9)struct addr_location ;struct perf_event_attr ;
Signature · 1 line
2.25.1
Adrian Hunter
reviewerRe: [PATCH v3 2/2] perf: script: add new output field 'dsoff' to print dso offset
Quoted 116 lines · Changbin Du
This adds a new 'dsoff' field to print dso offset for resolved symbols, and the offset is appended to dso name.
Default output:
$ perf script ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1)Display 'dsoff' field:
$ perf script -F +dsoff ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so+0x1c4b5) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1+0x68d0) ls 2695501 3011030.487019: 500000 cycles: ffffffff992a6db0 [unknown] ([unknown])Signed-off-by Changbin Du <[email protected]>--- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 9 ++++++++- tools/perf/util/evsel_fprintf.c | 6 ++++++ tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 16 insertions(+), 2 deletions(-)tools/perf/Documentation/perf-script.txt +1
-1@@ -130,7 +130,7 @@ OPTIONS -F:: --fields:: Comma separated list of fields to print. Options are: - comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr, symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth, phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat,tools/perf/builtin-script.c +8
-1@@ -133,6 +133,7 @@ enum perf_output_field {PERF_OUTPUT_VCPU =1ULL <<38 ,PERF_OUTPUT_CGROUP =1ULL <<39 ,PERF_OUTPUT_RETIRE_LAT =1ULL <<40 , + PERF_OUTPUT_DSOFF = 1ULL << 41, }; struct perf_script {@@ -174,6 +175,7 @@ struct output_option { {.str = "ip", .field = PERF_OUTPUT_IP}, {.str = "sym", .field = PERF_OUTPUT_SYM}, {.str = "dso", .field = PERF_OUTPUT_DSO}, + {.str = "dsoff", .field = PERF_OUTPUT_DSOFF}, {.str = "addr", .field = PERF_OUTPUT_ADDR}, {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET}, {.str = "srcline", .field = PERF_OUTPUT_SRCLINE},@@ -574,6 +576,11 @@ static void set_print_ip_opts(struct perf_event_attr *attr)if (PRINT_FIELD (DSO )) output[type].print_ip_opts |=EVSEL__PRINT_DSO ; +if (PRINT_FIELD (DSOFF )) { +/* 'dsoff' implys 'dso' field for printing */ + output[type].print_ip_opts |=EVSEL__PRINT_DSO |EVSEL__PRINT_DSOFF ; + } +if (PRINT_FIELD (SYMOFFSET )) output[type].print_ip_opts |=EVSEL__PRINT_SYMOFFSET ;@@ -3881,7 +3888,7 @@ int cmd_script(int argc, const char **argv)"comma separated output fields prepend with 'type:'. " "+field to add and -field to remove." "Valid types: hw,sw,trace,raw,synth. " -"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," +"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff" "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth," tools/perf/util/evsel_fprintf.c +4
-0@@ -116,6 +116,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_oneline = print_opts &EVSEL__PRINT_ONELINE ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;@@ -174,6 +175,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (print_dso && (!sym || !sym->inlined)) { printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (map, fp); +if (print_dsoff && map && map->dso) + printed +=fprintf (fp,"+0x%lx" , addr); printed +=fprintf (fp,")" ); }@@ -209,6 +212,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;int print_unknown_as_addr = print_opts &EVSEL__PRINT_UNKNOWN_AS_ADDR ;
tools/perf/util/evsel_fprintf.c int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, · line 245
Quoted 5 lines
tools/perf/util/evsel_fprintf.c +2
-0@@ -237,6 +241,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,if (print_dso) { printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (al->map, fp); +if (print_dsoff && al->map && al->map->dso) + printed +=fprintf (fp,"+0x%lx" , al->addr);
There are a lot of map__fprintf_dsoname() callers that should also support "dsoff". In fact, probably all of them except perf_sample__fprintf_callindent().
Quoted 15 lines
tools/perf/util/evsel_fprintf.c +0
-0printed +=fprintf (fp,")" ); }tools/perf/util/evsel_fprintf.h +1
-0@@ -26,6 +26,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE#define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6)#define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7)#define EVSEL__PRINT_SKIP_IGNORED (1<<8) +#define EVSEL__PRINT_DSOFF (1<<9)struct addr_location ;struct perf_event_attr ;
Re: [PATCH v3 2/2] perf: script: add new output field 'dsoff' to print dso offset
Quoted 118 lines · Adrian Hunter
Quoted 117 lines · Changbin Du
This adds a new 'dsoff' field to print dso offset for resolved symbols, and the offset is appended to dso name.
Default output:
$ perf script ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1)Display 'dsoff' field:
$ perf script -F +dsoff ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so+0x1c4b5) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unknown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unknown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __errno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1+0x68d0) ls 2695501 3011030.487019: 500000 cycles: ffffffff992a6db0 [unknown] ([unknown])Signed-off-by Changbin Du <[email protected]>--- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 9 ++++++++- tools/perf/util/evsel_fprintf.c | 6 ++++++ tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 16 insertions(+), 2 deletions(-)tools/perf/Documentation/perf-script.txt +1
-1@@ -130,7 +130,7 @@ OPTIONS -F:: --fields:: Comma separated list of fields to print. Options are: - comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr, symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth, phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat,tools/perf/builtin-script.c +8
-1@@ -133,6 +133,7 @@ enum perf_output_field {PERF_OUTPUT_VCPU =1ULL <<38 ,PERF_OUTPUT_CGROUP =1ULL <<39 ,PERF_OUTPUT_RETIRE_LAT =1ULL <<40 , + PERF_OUTPUT_DSOFF = 1ULL << 41, }; struct perf_script {@@ -174,6 +175,7 @@ struct output_option { {.str = "ip", .field = PERF_OUTPUT_IP}, {.str = "sym", .field = PERF_OUTPUT_SYM}, {.str = "dso", .field = PERF_OUTPUT_DSO}, + {.str = "dsoff", .field = PERF_OUTPUT_DSOFF}, {.str = "addr", .field = PERF_OUTPUT_ADDR}, {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET}, {.str = "srcline", .field = PERF_OUTPUT_SRCLINE},@@ -574,6 +576,11 @@ static void set_print_ip_opts(struct perf_event_attr *attr)if (PRINT_FIELD (DSO )) output[type].print_ip_opts |=EVSEL__PRINT_DSO ; +if (PRINT_FIELD (DSOFF )) { +/* 'dsoff' implys 'dso' field for printing */ + output[type].print_ip_opts |=EVSEL__PRINT_DSO |EVSEL__PRINT_DSOFF ; + } +if (PRINT_FIELD (SYMOFFSET )) output[type].print_ip_opts |=EVSEL__PRINT_SYMOFFSET ;@@ -3881,7 +3888,7 @@ int cmd_script(int argc, const char **argv)"comma separated output fields prepend with 'type:'. " "+field to add and -field to remove." "Valid types: hw,sw,trace,raw,synth. " -"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," +"Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff" "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth," tools/perf/util/evsel_fprintf.c +4
-0@@ -116,6 +116,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_oneline = print_opts &EVSEL__PRINT_ONELINE ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;@@ -174,6 +175,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,if (print_dso && (!sym || !sym->inlined)) { printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (map, fp); +if (print_dsoff && map && map->dso) + printed +=fprintf (fp,"+0x%lx" , addr); printed +=fprintf (fp,")" ); }@@ -209,6 +212,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;int print_dso = print_opts &EVSEL__PRINT_DSO ; +int print_dsoff = print_opts &EVSEL__PRINT_DSOFF ;int print_symoffset = print_opts &EVSEL__PRINT_SYMOFFSET ;int print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;int print_unknown_as_addr = print_opts &EVSEL__PRINT_UNKNOWN_AS_ADDR ;@@ -237,6 +241,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,if (print_dso) {
Quoted 9 lines
tools/perf/util/evsel_fprintf.c int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, · line 245
Quoted 4 lines
tools/perf/util/evsel_fprintf.c +2
-0printed +=fprintf (fp," (" ); printed +=map__fprintf_dsoname (al->map, fp); +if (print_dsoff && al->map && al->map->dso) + printed +=fprintf (fp,"+0x%lx" , al->addr);There are a lot of
map__fprintf_dsoname()callers that should also support "dsoff". In fact, probably all of them exceptperf_sample__fprintf_callindent().
Yes, just added all except perf_sample__fprintf_callindent(). Thanks for reminding me.
Quoted 16 lines
Quoted 15 lines
tools/perf/util/evsel_fprintf.c +0
-0printed +=fprintf (fp,")" ); }tools/perf/util/evsel_fprintf.h +1
-0@@ -26,6 +26,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE#define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6)#define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7)#define EVSEL__PRINT_SKIP_IGNORED (1<<8) +#define EVSEL__PRINT_DSOFF (1<<9)struct addr_location ;struct perf_event_attr ;
Signature · 2 lines
Cheers, Changbin Du