perf script: Add printing of sample address

[pandora-kernel.git] / tools / perf / builtin-script.c

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 974f6d3..3056b45 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -10,7 +10,6 @@
 #include "util/symbol.h"
 #include "util/thread.h"
 #include "util/trace-event.h"
-#include "util/parse-options.h"
 #include "util/util.h"
 #include "util/evlist.h"
 #include "util/evsel.h"
@@ -31,7 +30,10 @@ enum perf_output_field {
        PERF_OUTPUT_CPU             = 1U << 4,
        PERF_OUTPUT_EVNAME          = 1U << 5,
        PERF_OUTPUT_TRACE           = 1U << 6,
-       PERF_OUTPUT_SYM             = 1U << 7,
+       PERF_OUTPUT_IP              = 1U << 7,
+       PERF_OUTPUT_SYM             = 1U << 8,
+       PERF_OUTPUT_DSO             = 1U << 9,
+       PERF_OUTPUT_ADDR            = 1U << 10,
 };
 
 struct output_option {
@@ -45,7 +47,10 @@ struct output_option {
        {.str = "cpu",   .field = PERF_OUTPUT_CPU},
        {.str = "event", .field = PERF_OUTPUT_EVNAME},
        {.str = "trace", .field = PERF_OUTPUT_TRACE},
+       {.str = "ip",    .field = PERF_OUTPUT_IP},
        {.str = "sym",   .field = PERF_OUTPUT_SYM},
+       {.str = "dso",   .field = PERF_OUTPUT_DSO},
+       {.str = "addr",  .field = PERF_OUTPUT_ADDR},
 };
 
 /* default set to maintain compatibility with current format */
@@ -61,7 +66,8 @@ static struct {
 
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -71,7 +77,8 @@ static struct {
 
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -89,7 +96,8 @@ static struct {
 
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -158,9 +166,9 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                !perf_session__has_traces(session, "record -R"))
                return -EINVAL;
 
-       if (PRINT_FIELD(SYM)) {
+       if (PRINT_FIELD(IP)) {
                if (perf_event_attr__check_stype(attr, PERF_SAMPLE_IP, "IP",
-                                          PERF_OUTPUT_SYM))
+                                          PERF_OUTPUT_IP))
                        return -EINVAL;
 
                if (!no_callchain &&
@@ -168,6 +176,24 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                        symbol_conf.use_callchain = false;
        }
 
+       if (PRINT_FIELD(ADDR) &&
+               perf_event_attr__check_stype(attr, PERF_SAMPLE_ADDR, "ADDR",
+                                      PERF_OUTPUT_ADDR))
+               return -EINVAL;
+
+       if (PRINT_FIELD(SYM) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
+               pr_err("Display of symbols requested but neither sample IP nor "
+                          "sample address\nis selected. Hence, no addresses to convert "
+                      "to symbols.\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 "
+                      "to DSO.\n");
+               return -EINVAL;
+       }
+
        if ((PRINT_FIELD(PID) || PRINT_FIELD(TID)) &&
                perf_event_attr__check_stype(attr, PERF_SAMPLE_TID, "TID",
                                       PERF_OUTPUT_TID|PERF_OUTPUT_PID))
@@ -231,7 +257,7 @@ static void print_sample_start(struct perf_sample *sample,
        if (PRINT_FIELD(COMM)) {
                if (latency_format)
                        printf("%8.8s ", thread->comm);
-               else if (PRINT_FIELD(SYM) && symbol_conf.use_callchain)
+               else if (PRINT_FIELD(IP) && symbol_conf.use_callchain)
                        printf("%s ", thread->comm);
                else
                        printf("%16s ", thread->comm);
@@ -272,6 +298,63 @@ static void print_sample_start(struct perf_sample *sample,
        }
 }
 
+static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
+{
+       if ((attr->type == PERF_TYPE_SOFTWARE) &&
+           ((attr->config == PERF_COUNT_SW_PAGE_FAULTS) ||
+            (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MIN) ||
+            (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ)))
+               return true;
+
+       return false;
+}
+
+static void print_sample_addr(union perf_event *event,
+                         struct perf_sample *sample,
+                         struct perf_session *session,
+                         struct thread *thread,
+                         struct perf_event_attr *attr)
+{
+       struct addr_location al;
+       u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+       const char *symname, *dsoname;
+
+       printf("%16" PRIx64, sample->addr);
+
+       if (!sample_addr_correlates_sym(attr))
+               return;
+
+       thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
+                             event->ip.pid, sample->addr, &al);
+       if (!al.map)
+               thread__find_addr_map(thread, session, cpumode, MAP__VARIABLE,
+                                     event->ip.pid, sample->addr, &al);
+
+       al.cpu = sample->cpu;
+       al.sym = NULL;
+
+       if (al.map)
+               al.sym = map__find_symbol(al.map, al.addr, NULL);
+
+       if (PRINT_FIELD(SYM)) {
+               if (al.sym && al.sym->name)
+                       symname = al.sym->name;
+               else
+                       symname = "";
+
+               printf(" %16s", symname);
+       }
+
+       if (PRINT_FIELD(DSO)) {
+               if (al.map && al.map->dso && al.map->dso->name)
+                       dsoname = al.map->dso->name;
+               else
+                       dsoname = "";
+
+               printf(" (%s)", dsoname);
+       }
+}
+
 static void process_event(union perf_event *event __unused,
                          struct perf_sample *sample,
                          struct perf_evsel *evsel,
@@ -289,12 +372,16 @@ static void process_event(union perf_event *event __unused,
                print_trace_event(sample->cpu, sample->raw_data,
                                  sample->raw_size);
 
-       if (PRINT_FIELD(SYM)) {
+       if (PRINT_FIELD(ADDR))
+               print_sample_addr(event, sample, session, thread, attr);
+
+       if (PRINT_FIELD(IP)) {
                if (!symbol_conf.use_callchain)
                        printf(" ");
                else
                        printf("\n");
-               perf_session__print_symbols(event, sample, session);
+               perf_session__print_ip(event, sample, session,
+                                             PRINT_FIELD(SYM), PRINT_FIELD(DSO));
        }
 
        printf("\n");
@@ -986,7 +1073,7 @@ 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,sym",
+                    "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",
                     parse_output_fields),
 
        OPT_END()