15 files changed, 116 insertions, 41 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7dabde14ea54..e5670f1af737 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -17,11 +17,13 @@
 #include "debug.h"
 #include "annotate.h"
 #include "evsel.h"
+#include <regex.h>
 #include <pthread.h>
 #include <linux/bitops.h>
 
 const char      *disassembler_style;
 const char      *objdump_path;
+static regex_t   file_lineno;
 
 static struct ins *ins__find(const char *name);
 static int disasm_line__parse(char *line, char **namep, char **rawp);
@@ -570,13 +572,15 @@ out_free_name:
         return -1;
 }
 
-static struct disasm_line *disasm_line__new(s64 offset, char *line, size_t privsize)
+static struct disasm_line *disasm_line__new(s64 offset, char *line,
+                                        size_t privsize, int line_nr)
 {
         struct disasm_line *dl = zalloc(sizeof(*dl) + privsize);
 
         if (dl != NULL) {
                 dl->offset = offset;
                 dl->line = strdup(line);
+                dl->line_nr = line_nr;
                 if (dl->line == NULL)
                         goto out_delete;
 
@@ -788,13 +792,15 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
  * The ops.raw part will be parsed further according to type of the instruction.
  */
 static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
-                                      FILE *file, size_t privsize)
+                                      FILE *file, size_t privsize,
+                                      int *line_nr)
 {
         struct annotation *notes = symbol__annotation(sym);
         struct disasm_line *dl;
         char *line = NULL, *parsed_line, *tmp, *tmp2, *c;
         size_t line_len;
         s64 line_ip, offset = -1;
+        regmatch_t match[2];
 
         if (getline(&line, &line_len, file) < 0)
                 return -1;
@@ -812,6 +818,12 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
         line_ip = -1;
         parsed_line = line;
 
+        /* /filename:linenr ? Save line number and ignore. */
+        if (regexec(&file_lineno, line, 2, match, 0) == 0) {
+                *line_nr = atoi(line + match[1].rm_so);
+                return 0;
+        }
+
         /*
          * Strip leading spaces:
          */
@@ -842,8 +854,9 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
                         parsed_line = tmp2 + 1;
         }
 
-        dl = disasm_line__new(offset, parsed_line, privsize);
+        dl = disasm_line__new(offset, parsed_line, privsize, *line_nr);
         free(line);
+        (*line_nr)++;
 
         if (dl == NULL)
                 return -1;
@@ -869,6 +882,11 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
         return 0;
 }
 
+static __attribute__((constructor)) void symbol__init_regexpr(void)
+{
+        regcomp(&file_lineno, "^/[^:]+:([0-9]+)", REG_EXTENDED);
+}
+
 static void delete_last_nop(struct symbol *sym)
 {
         struct annotation *notes = symbol__annotation(sym);
@@ -904,6 +922,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
         char symfs_filename[PATH_MAX];
         struct kcore_extract kce;
         bool delete_extract = false;
+        int lineno = 0;
 
         if (filename)
                 symbol__join_symfs(symfs_filename, filename);
@@ -915,6 +934,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
                         return -ENOMEM;
                 }
                 goto fallback;
+        } else if (dso__is_kcore(dso)) {
+                goto fallback;
         } else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
                    strstr(command, "[kernel.kallsyms]") ||
                    access(symfs_filename, R_OK)) {
@@ -982,7 +1003,7 @@ fallback:
         snprintf(command, sizeof(command),
                  "%s %s%s --start-address=0x%016" PRIx64
                  " --stop-address=0x%016" PRIx64
-                 " -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
+                 " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
                  objdump_path ? objdump_path : "objdump",
                  disassembler_style ? "-M " : "",
                  disassembler_style ? disassembler_style : "",
@@ -999,7 +1020,8 @@ fallback:
                 goto out_free_filename;
 
         while (!feof(file))
-                if (symbol__parse_objdump_line(sym, map, file, privsize) < 0)
+                if (symbol__parse_objdump_line(sym, map, file, privsize,
+                            &lineno) < 0)
                         break;
 
         /*
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 112d6e268150..0784a9420528 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -58,6 +58,7 @@ struct disasm_line {
         char                *line;
         char                *name;
         struct ins          *ins;
+        int                 line_nr;
         struct ins_operands ops;
 };
 
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index dd2a3e52ada1..e8d79e5bfaf7 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -18,6 +18,9 @@
 #include "header.h"
 #include "vdso.h"
 
+
+static bool no_buildid_cache;
+
 int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
                            union perf_event *event,
                            struct perf_sample *sample,
@@ -251,6 +254,11 @@ int dsos__hit_all(struct perf_session *session)
         return 0;
 }
 
+void disable_buildid_cache(void)
+{
+        no_buildid_cache = true;
+}
+
 int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
                           const char *name, bool is_kallsyms, bool is_vdso)
 {
@@ -404,6 +412,9 @@ int perf_session__cache_build_ids(struct perf_session *session)
         int ret;
         char debugdir[PATH_MAX];
 
+        if (no_buildid_cache)
+                return 0;
+
         snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);
 
         if (mkdir(debugdir, 0755) != 0 && errno != EEXIST)
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index 666a3bd4f64e..8236319514d5 100644
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -25,5 +25,6 @@ int perf_session__cache_build_ids(struct perf_session *session);
 int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
                           const char *name, bool is_kallsyms, bool is_vdso);
 int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir);
+void disable_buildid_cache(void);
 
 #endif
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 00229809a904..38da69c8c1ff 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -808,3 +808,22 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *
 out:
         return 1;
 }
+
+char *callchain_list__sym_name(struct callchain_list *cl,
+                               char *bf, size_t bfsize, bool show_dso)
+{
+        int printed;
+
+        if (cl->ms.sym) {
+                printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name);
+        } else
+                printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip);
+
+        if (show_dso)
+                scnprintf(bf + printed, bfsize - printed, " %s",
+                          cl->ms.map ?
+                          cl->ms.map->dso->short_name :
+                          "unknown");
+
+        return bf;
+}
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 3caccc2c173c..3e1ed15d11f1 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -193,4 +193,7 @@ static inline int arch_skip_callchain_idx(struct thread *thread __maybe_unused,
 }
 #endif
 
+char *callchain_list__sym_name(struct callchain_list *cl,
+                               char *bf, size_t bfsize, bool show_dso);
+
 #endif  /* __PERF_CALLCHAIN_H */
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 7e23dae54f1d..cfbe2b99b9aa 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -816,7 +816,15 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
                         perf_evlist__mmap_get(evlist, idx);
                 }
 
-                if (__perf_evlist__add_pollfd(evlist, fd, idx) < 0) {
+                /*
+                 * The system_wide flag causes a selected event to be opened
+                 * always without a pid.  Consequently it will never get a
+                 * POLLHUP, but it is used for tracking in combination with
+                 * other events, so it should not need to be polled anyway.
+                 * Therefore don't add it for polling.
+                 */
+                if (!evsel->system_wide &&
+                    __perf_evlist__add_pollfd(evlist, fd, idx) < 0) {
                         perf_evlist__mmap_put(evlist, idx);
                         return -1;
                 }
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 34344ffa79ca..f2dc91fb87fa 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -658,6 +658,14 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
                 attr->mmap_data = track;
         }
 
+        /*
+         * We don't allow user space callchains for  function trace
+         * event, due to issues with page faults while tracing page
+         * fault handler and its overall trickiness nature.
+         */
+        if (perf_evsel__is_function_event(evsel))
+                evsel->attr.exclude_callchain_user = 1;
+
         if (callchain_param.enabled && !evsel->no_aux_samples)
                 perf_evsel__config_callgraph(evsel);
 
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 05fab7a188dc..b20e40c74468 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -24,8 +24,6 @@
 #include "build-id.h"
 #include "data.h"
 
-static bool no_buildid_cache = false;
-
 static u32 header_argc;
 static const char **header_argv;
 
@@ -191,8 +189,7 @@ static int write_build_id(int fd, struct perf_header *h,
                 pr_debug("failed to write buildid table\n");
                 return err;
         }
-        if (!no_buildid_cache)
-                perf_session__cache_build_ids(session);
+        perf_session__cache_build_ids(session);
 
         return 0;
 }
@@ -2791,8 +2788,3 @@ int perf_event__process_build_id(struct perf_tool *tool __maybe_unused,
                                  session);
         return 0;
 }
-
-void disable_buildid_cache(void)
-{
-        no_buildid_cache = true;
-}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 52e94902afb1..d97309c87bd6 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1381,6 +1381,34 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample,
         return mi;
 }
 
+static int add_callchain_ip(struct thread *thread,
+                            struct symbol **parent,
+                            struct addr_location *root_al,
+                            int cpumode,
+                            u64 ip)
+{
+        struct addr_location al;
+
+        al.filtered = 0;
+        al.sym = NULL;
+        thread__find_addr_location(thread, cpumode, MAP__FUNCTION,
+                                   ip, &al);
+        if (al.sym != NULL) {
+                if (sort__has_parent && !*parent &&
+                    symbol__match_regex(al.sym, &parent_regex))
+                        *parent = al.sym;
+                else if (have_ignore_callees && root_al &&
+                  symbol__match_regex(al.sym, &ignore_callees_regex)) {
+                        /* Treat this symbol as the root,
+                           forgetting its callees. */
+                        *root_al = al;
+                        callchain_cursor_reset(&callchain_cursor);
+                }
+        }
+
+        return callchain_cursor_append(&callchain_cursor, al.addr, al.map, al.sym);
+}
+
 struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
                                            struct addr_location *al)
 {
@@ -1427,7 +1455,6 @@ static int thread__resolve_callchain_sample(struct thread *thread,
 
         for (i = 0; i < chain_nr; i++) {
                 u64 ip;
-                struct addr_location al;
 
                 if (callchain_param.order == ORDER_CALLEE)
                         j = i;
@@ -1464,24 +1491,10 @@ static int thread__resolve_callchain_sample(struct thread *thread,
                         continue;
                 }
 
-                al.filtered = 0;
-                thread__find_addr_location(thread, cpumode,
-                                           MAP__FUNCTION, ip, &al);
-                if (al.sym != NULL) {
-                        if (sort__has_parent && !*parent &&
-                            symbol__match_regex(al.sym, &parent_regex))
-                                *parent = al.sym;
-                        else if (have_ignore_callees && root_al &&
-                          symbol__match_regex(al.sym, &ignore_callees_regex)) {
-                                /* Treat this symbol as the root,
-                                   forgetting its callees. */
-                                *root_al = al;
-                                callchain_cursor_reset(&callchain_cursor);
-                        }
-                }
-
-                err = callchain_cursor_append(&callchain_cursor,
-                                              ip, al.map, al.sym);
+                err = add_callchain_ip(thread, parent, root_al,
+                                       cpumode, ip);
+                if (err == -EINVAL)
+                        break;
                 if (err)
                         return err;
         }
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 9402885a77f3..82a5596241a7 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -309,7 +309,7 @@ sort__srcline_cmp(struct hist_entry *left, struct hist_entry *right)
 static int hist_entry__srcline_snprintf(struct hist_entry *he, char *bf,
                                         size_t size, unsigned int width)
 {
-        return repsep_snprintf(bf, size, "%*.*-s", width, width, he->srcline);
+        return repsep_snprintf(bf, size, "%-*.*s", width, width, he->srcline);
 }
 
 struct sort_entry sort_srcline = {
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index f3e4bc5fe5d2..77c180637138 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -274,7 +274,7 @@ char *get_srcline(struct dso *dso, unsigned long addr)
         if (!addr2line(dso_name, addr, &file, &line, dso))
                 goto out;
 
-        if (asprintf(&srcline, "%s:%u", file, line) < 0) {
+        if (asprintf(&srcline, "%s:%u", basename(file), line) < 0) {
                 free(file);
                 goto out;
         }
diff --git a/tools/perf/util/symbol-minimal.c b/tools/perf/util/symbol-minimal.c
index c9541fea9514..fa585c63f56a 100644
--- a/tools/perf/util/symbol-minimal.c
+++ b/tools/perf/util/symbol-minimal.c
@@ -341,7 +341,6 @@ int dso__load_sym(struct dso *dso, struct map *map __maybe_unused,
 
         if (filename__read_build_id(ss->name, build_id, BUILD_ID_SIZE) > 0) {
                 dso__set_build_id(dso, build_id);
-                return 1;
         }
         return 0;
 }
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index a2157f0ef1df..9ebc8b1f9be5 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -103,15 +103,14 @@ struct comm *thread__exec_comm(const struct thread *thread)
         return last;
 }
 
-/* CHECKME: time should always be 0 if event aren't ordered */
 int __thread__set_comm(struct thread *thread, const char *str, u64 timestamp,
                        bool exec)
 {
         struct comm *new, *curr = thread__comm(thread);
         int err;
 
-        /* Override latest entry if it had no specific time coverage */
-        if (!curr->start && !curr->exec) {
+        /* Override the default :tid entry */
+        if (!thread->comm_set) {
                 err = comm__override(curr, str, timestamp, exec);
                 if (err)
                         return err;
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 7dc44cfe25b3..76d23d83eae5 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -154,7 +154,6 @@ extern void set_die_routine(void (*routine)(const char *err, va_list params) NOR
 
 extern int prefixcmp(const char *str, const char *prefix);
 extern void set_buildid_dir(void);
-extern void disable_buildid_cache(void);
 
 static inline const char *skip_prefix(const char *str, const char *prefix)
 {