Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible fixes:

 - Fallback to kallsyms when using the minimal 'ELF' loader (Arnaldo Carvalho de Melo)

 - Fix annotation with kcore (Adrian Hunter)

 - Fix up srcline histogram key formatting (Arnaldo Carvalho de Melo)

 - Add missing handler for PERF_RECORD_MMAP2 events in 'perf diff' (Kan Liang)

User visible changes/new features:

 - Only print base source file for srcline histogram sort key (Andi Kleen)

 - Support source line numbers in annotate using a hotkey (Andi Kleen)

Infrastructure changes and fixes:

 - Do not poll events that use the system_wide flag (Adrian Hunter)

 - Add perf-read-vdso32 and perf-read-vdsox32 to .gitignore (Adrian Hunter)

 - Only override the default :tid comm entry (Adrian Hunter)

 - Factor out adding new call chain entries (Andi Kleen)

 - Use al.addr to set up call chain (Andi Kleen)

 - Use a common function to resolve symbol or name (Andi Kleen)

 - Fix ftrace:function event recording (Jiri Olsa)

 - Move disable_buildid_cache() to util/build-id.c (Namhyung Kim)

 - Clean up libelf feature support code (Namhyung Kim)

 - Fix typo in python 'perf test' (WANG Chao)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

24 files changed, 145 insertions, 88 deletions

diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
index 717221e98450..40399c3d97d6 100644
--- a/tools/perf/.gitignore
+++ b/tools/perf/.gitignore
@@ -2,6 +2,8 @@ PERF-CFLAGS
 PERF-GUI-VARS
 PERF-VERSION-FILE
 perf
+perf-read-vdso32
+perf-read-vdsox32
 perf-help
 perf-record
 perf-report
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index aecf61dcd754..478efa9b2364 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -497,8 +497,6 @@ ifneq ($(OUTPUT),)
 endif
 
 ifdef NO_LIBELF
-EXTLIBS := $(filter-out -lelf,$(EXTLIBS))
-
 # Remove ELF/DWARF dependent codes
 LIB_OBJS := $(filter-out $(OUTPUT)util/symbol-elf.o,$(LIB_OBJS))
 LIB_OBJS := $(filter-out $(OUTPUT)util/dwarf-aux.o,$(LIB_OBJS))
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 25114c9a6801..1ce425d101a9 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -357,6 +357,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
 static struct perf_tool tool = {
         .sample = diff__process_sample_event,
         .mmap   = perf_event__process_mmap,
+        .mmap2  = perf_event__process_mmap2,
         .comm   = perf_event__process_comm,
         .exit   = perf_event__process_exit,
         .fork   = perf_event__process_fork,
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 79f906c7124e..5d4b039fe1ed 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -150,7 +150,7 @@ CFLAGS += -std=gnu99
 # adding assembler files missing the .GNU-stack linker note.
 LDFLAGS += -Wl,-z,noexecstack
 
-EXTLIBS = -lelf -lpthread -lrt -lm -ldl
+EXTLIBS = -lpthread -lrt -lm -ldl
 
 ifneq ($(OUTPUT),)
   OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/
@@ -354,6 +354,7 @@ endif # NO_LIBELF
 
 ifndef NO_LIBELF
   CFLAGS += -DHAVE_LIBELF_SUPPORT
+  EXTLIBS += -lelf
 
   ifeq ($(feature-libelf-mmap), 1)
     CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
@@ -373,7 +374,7 @@ ifndef NO_LIBELF
     else
       CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
       LDFLAGS += $(LIBDW_LDFLAGS)
-      EXTLIBS += -lelf -ldw
+      EXTLIBS += -ldw
     endif # PERF_HAVE_DWARF_REGS
   endif # NO_DWARF
 endif # NO_LIBELF
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 162c978f1491..4b7d9ab0f049 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -85,7 +85,7 @@ static struct test {
                 .func = test__hists_link,
         },
         {
-                .desc = "Try 'use perf' in python, checking link problems",
+                .desc = "Try 'import perf' in python, checking link problems",
                 .func = test__python_use,
         },
         {
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index f0697a3aede0..1e0a2fd80115 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -27,6 +27,7 @@ static struct annotate_browser_opt {
         bool hide_src_code,
              use_offset,
              jump_arrows,
+             show_linenr,
              show_nr_jumps;
 } annotate_browser__opts = {
         .use_offset     = true,
@@ -128,7 +129,11 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
         if (!*dl->line)
                 slsmg_write_nstring(" ", width - pcnt_width);
         else if (dl->offset == -1) {
-                printed = scnprintf(bf, sizeof(bf), "%*s  ",
+                if (dl->line_nr && annotate_browser__opts.show_linenr)
+                        printed = scnprintf(bf, sizeof(bf), "%-*d ",
+                                        ab->addr_width + 1, dl->line_nr);
+                else
+                        printed = scnprintf(bf, sizeof(bf), "%*s  ",
                                     ab->addr_width, " ");
                 slsmg_write_nstring(bf, printed);
                 slsmg_write_nstring(dl->line, width - printed - pcnt_width + 1);
@@ -733,6 +738,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
                 "o             Toggle disassembler output/simplified view\n"
                 "s             Toggle source code view\n"
                 "/             Search string\n"
+                "k             Toggle line numbers\n"
                 "r             Run available scripts\n"
                 "?             Search string backwards\n");
                         continue;
@@ -741,6 +747,10 @@ static int annotate_browser__run(struct annotate_browser *browser,
                                 script_browse(NULL);
                                 continue;
                         }
+                case 'k':
+                        annotate_browser__opts.show_linenr =
+                                !annotate_browser__opts.show_linenr;
+                        break;
                 case 'H':
                         nd = browser->curr_hot;
                         break;
@@ -984,6 +994,7 @@ static struct annotate_config {
 } annotate__configs[] = {
         ANNOTATE_CFG(hide_src_code),
         ANNOTATE_CFG(jump_arrows),
+        ANNOTATE_CFG(show_linenr),
         ANNOTATE_CFG(show_nr_jumps),
         ANNOTATE_CFG(use_offset),
 };
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cfb976b3de3a..12c17c5a3d68 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -463,23 +463,6 @@ out:
         return key;
 }
 
-static char *callchain_list__sym_name(struct callchain_list *cl,
-                                      char *bf, size_t bfsize, bool show_dso)
-{
-        int printed;
-
-        if (cl->ms.sym)