1 files changed, 24 insertions, 12 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index e06c4f869330..212214162bb2 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -40,6 +40,7 @@
 #include "util/xyarray.h"
 #include "util/sort.h"
 #include "util/intlist.h"
+#include "arch/common.h"
 
 #include "util/debug.h"
 
@@ -102,7 +103,8 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
         /*
          * We can't annotate with just /proc/kallsyms
          */
-        if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS) {
+        if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
+            !dso__is_kcore(map->dso)) {
                 pr_err("Can't annotate %s: No vmlinux file was found in the "
                        "path\n", sym->name);
                 sleep(1);
@@ -237,8 +239,6 @@ out_unlock:
         pthread_mutex_unlock(&notes->lock);
 }
 
-static const char               CONSOLE_CLEAR[] = "";
-
 static struct hist_entry *perf_evsel__add_hist_entry(struct perf_evsel *evsel,
                                                      struct addr_location *al,
                                                      struct perf_sample *sample)
@@ -689,7 +689,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
 {
         struct perf_top *top = container_of(tool, struct perf_top, tool);
         struct symbol *parent = NULL;
-        u64 ip = event->ip.ip;
+        u64 ip = sample->ip;
         struct addr_location al;
         int err;
 
@@ -699,10 +699,10 @@ static void perf_event__process_sample(struct perf_tool *tool,
                 if (!seen)
                         seen = intlist__new(NULL);
 
-                if (!intlist__has_entry(seen, event->ip.pid)) {
+                if (!intlist__has_entry(seen, sample->pid)) {
                         pr_err("Can't find guest [%d]'s kernel information\n",
-                                event->ip.pid);
-                        intlist__add(seen, event->ip.pid);
+                                sample->pid);
+                        intlist__add(seen, sample->pid);
                 }
                 return;
         }
@@ -716,8 +716,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
         if (event->header.misc & PERF_RECORD_MISC_EXACT_IP)
                 top->exact_samples++;
 
-        if (perf_event__preprocess_sample(event, machine, &al, sample,
-                                          symbol_filter) < 0 ||
+        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0 ||
             al.filtered)
                 return;
 
@@ -772,8 +771,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
                     sample->callchain) {
                         err = machine__resolve_callchain(machine, evsel,
                                                          al.thread, sample,
-                                                         &parent);
-
+                                                         &parent, &al);
                         if (err)
                                 return;
                 }
@@ -838,7 +836,8 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                         break;
                 case PERF_RECORD_MISC_GUEST_KERNEL:
                         ++top->guest_kernel_samples;
-                        machine = perf_session__find_machine(session, event->ip.pid);
+                        machine = perf_session__find_machine(session,
+                                                             sample.pid);
                         break;
                 case PERF_RECORD_MISC_GUEST_USER:
                         ++top->guest_us_samples;
@@ -939,6 +938,14 @@ static int __cmd_top(struct perf_top *top)
         if (top->session == NULL)
                 return -ENOMEM;
 
+        machines__set_symbol_filter(&top->session->machines, symbol_filter);
+
+        if (!objdump_path) {
+                ret = perf_session_env__lookup_objdump(&top->session->header.env);
+                if (ret)
+                        goto out_delete;
+        }
+
         ret = perf_top__setup_sample_type(top);
         if (ret)
                 goto out_delete;
@@ -1102,6 +1109,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_CALLBACK_DEFAULT('G', "call-graph", &top.record_opts,
                              "mode[,dump_size]", record_callchain_help,
                              &parse_callchain_opt, "fp"),
+        OPT_CALLBACK(0, "ignore-callees", NULL, "regex",
+                   "ignore callees of these functions in call graphs",
+                   report_parse_ignore_callees_opt),
         OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
                     "Show a column with the sum of periods"),
         OPT_STRING(0, "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
@@ -1114,6 +1124,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                     "Interleave source code with assembly code (default)"),
         OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
                     "Display raw encoding of assembly instructions (default)"),
+        OPT_STRING(0, "objdump", &objdump_path, "path",
+                    "objdump binary to use for disassembly and annotations"),
         OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
                    "Specify disassembler style (e.g. -M intel for intel syntax)"),
         OPT_STRING('u', "uid", &target->uid_str, "user", "user to profile"),