perf script: Add the offset field specifier

Add the offset field specifier 'symoff' to show the offset from
the symbols in the output of perf-script. We can get the more
detailed address information.

Output sample:
ffffffff81467612 irq_return+0x0 => 301ec016b0 _start+0x0
ffffffff81467612 irq_return+0x0 => 301ec016b0 _start+0x0
      301ec016b3 _start+0x3     => 301ec04b70 _dl_start+0x0
ffffffff81467612 irq_return+0x0 => 301ec04b70 _dl_start+0x0
ffffffff81467612 irq_return+0x0 => 301ec04b96 _dl_start+0x26
ffffffff81467612 irq_return+0x0 => 301ec04b9d _dl_start+0x2d
      301ec04beb _dl_start+0x7b => 301ec04c0d _dl_start+0x9d
      301ec04c11 _dl_start+0xa1 => 301ec04bf0 _dl_start+0x80
[snip]

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20120130044314.2384.67094.stgit@linux3
Signed-off-by: Akihiro Nagai <akihiro.nagai.hw@hitachi.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 2f6cef43da25091e769f890291a69f6cf2ad9d19..228c7bb0f0dd153139c4bbe8ab29417ca39e6481 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -115,7 +115,7 @@ OPTIONS
 -f::
 --fields::
         Comma separated list of fields to print. Options are:
-        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr.
+        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff.
         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

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 414d49ad83deef554cb9ab297dc687436c98c3b2..752d4018d06dc8b31948fdd3b19d24299d7d9f6e 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -40,6 +40,7 @@ enum perf_output_field {
        PERF_OUTPUT_SYM             = 1U << 8,
        PERF_OUTPUT_DSO             = 1U << 9,
        PERF_OUTPUT_ADDR            = 1U << 10,
+       PERF_OUTPUT_SYMOFFSET       = 1U << 11,
 };
 
 struct output_option {
@@ -57,6 +58,7 @@ struct output_option {
        {.str = "sym",   .field = PERF_OUTPUT_SYM},
        {.str = "dso",   .field = PERF_OUTPUT_DSO},
        {.str = "addr",  .field = PERF_OUTPUT_ADDR},
+       {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET},
 };
 
 /* default set to maintain compatibility with current format */
@@ -193,6 +195,11 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                       "to symbols.\n");
                return -EINVAL;
        }
+       if (PRINT_FIELD(SYMOFFSET) && !PRINT_FIELD(SYM)) {
+               pr_err("Display of offsets requested but symbol is not"
+                      "selected.\n");
+               return -EINVAL;
+       }
        if (PRINT_FIELD(DSO) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
                pr_err("Display of DSO requested but neither sample IP nor "
                           "sample address\nis selected. Hence, no addresses to convert "
@@ -353,7 +360,10 @@ static void print_sample_addr(union perf_event *event,
 
        if (PRINT_FIELD(SYM)) {
                printf(" ");
-               symbol__fprintf_symname(al.sym, stdout);
+               if (PRINT_FIELD(SYMOFFSET))
+                       symbol__fprintf_symname_offs(al.sym, &al, stdout);
+               else
+                       symbol__fprintf_symname(al.sym, stdout);
        }
 
        if (PRINT_FIELD(DSO)) {
@@ -378,7 +388,8 @@ static void print_sample_bts(union perf_event *event,
                else
                        printf("\n");
                perf_event__print_ip(event, sample, machine, evsel,
-                                    PRINT_FIELD(SYM), PRINT_FIELD(DSO));
+                                    PRINT_FIELD(SYM), PRINT_FIELD(DSO),
+                                    PRINT_FIELD(SYMOFFSET));
        }
 
        printf(" => ");
@@ -421,7 +432,8 @@ static void process_event(union perf_event *event __unused,
                else
                        printf("\n");
                perf_event__print_ip(event, sample, machine, evsel,
-                                    PRINT_FIELD(SYM), PRINT_FIELD(DSO));
+                                    PRINT_FIELD(SYM), PRINT_FIELD(DSO),
+                                    PRINT_FIELD(SYMOFFSET));
        }
 
        printf("\n");
@@ -1131,7 +1143,10 @@ static const struct option options[] = {
        OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
                    "Look for files with symbols relative to this directory"),
        OPT_CALLBACK('f', "fields", NULL, "str",
-                    "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,addr",
+                    "comma separated output fields prepend with 'type:'. "
+                    "Valid types: hw,sw,trace,raw. "
+                    "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,"
+                    "addr,symoff",
                     parse_output_fields),
        OPT_BOOLEAN('a', "all-cpus", &system_wide,
                     "system-wide collection from all CPUs"),

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e5334a976536d88d0dff86034becce2ff801d275..552c1c50eea19ddab61d322cff026f23170e1289 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1293,7 +1293,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
 
 void perf_event__print_ip(union perf_event *event, struct perf_sample *sample,
                          struct machine *machine, struct perf_evsel *evsel,
-                         int print_sym, int print_dso)
+                         int print_sym, int print_dso, int print_symoffset)
 {
        struct addr_location al;
        struct callchain_cursor *cursor = &evsel->hists.callchain_cursor;
@@ -1340,7 +1340,11 @@ void perf_event__print_ip(union perf_event *event, struct perf_sample *sample,
                printf("%16" PRIx64, sample->ip);
                if (print_sym) {
                        printf(" ");
-                       symbol__fprintf_symname(al.sym, stdout);
+                       if (print_symoffset)
+                               symbol__fprintf_symname_offs(al.sym, &al,
+                                                            stdout);
+                       else
+                               symbol__fprintf_symname(al.sym, stdout);
                }
 
                if (print_dso) {

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 37bc38381fb67940b4290d619603c5786d03eab0..c8d90178e7dea687cedfc684a0f76754beab3d5d 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -147,7 +147,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
 
 void perf_event__print_ip(union perf_event *event, struct perf_sample *sample,
                          struct machine *machine, struct perf_evsel *evsel,
-                         int print_sym, int print_dso);
+                         int print_sym, int print_dso, int print_symoffset);
 
 int perf_session__cpu_bitmap(struct perf_session *session,
                             const char *cpu_list, unsigned long *cpu_bitmap);

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index b580fa82911a864247313c360f828e63fc6fe5e3..fc6e12fe4b44f16ab86e7bee67b0c94acd616eb7 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -263,16 +263,26 @@ static size_t symbol__fprintf(struct symbol *sym, FILE *fp)
                       sym->name);
 }
 
-size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp)
+size_t symbol__fprintf_symname_offs(const struct symbol *sym,
+                                   const struct addr_location *al, FILE *fp)
 {
-       const char *symname;
+       unsigned long offset;
+       size_t length;
 
-       if (sym && sym->name)
-               symname = sym->name;
-       else
-               symname = "[unknown]";
+       if (sym && sym->name) {
+               length = fprintf(fp, "%s", sym->name);
+               if (al) {
+                       offset = al->addr - sym->start;
+                       length += fprintf(fp, "+0x%lx", offset);
+               }
+               return length;
+       } else
+               return fprintf(fp, "[unknown]");
+}
 
-       return fprintf(fp, "%s", symname);
+size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp)
+{
+       return symbol__fprintf_symname_offs(sym, NULL, fp);
 }
 
 void dso__set_long_name(struct dso *dso, char *name)

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index d349c7a00b049d31daa7dd47f38c701d3557a8e2..ba909c9970e2d22b73272ae2e7e2722b3e57e18b 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -241,6 +241,8 @@ void machines__destroy_guest_kernel_maps(struct rb_root *machines);
 
 int symbol__init(void);
 void symbol__exit(void);
+size_t symbol__fprintf_symname_offs(const struct symbol *sym,
+                                   const struct addr_location *al, FILE *fp);
 size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp);
 bool symbol_type__is_a(char symbol_type, enum map_type map_type);