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

Pull tooling improvements and fixes from Arnaldo Carvalho de Melo:

perf annotate fixes and improvements:

- Allow showing offsets in more than just jump targets, use the new
  'O' hotkey in the TUI, config ~/.perfconfig annotate.offset_level
  for it and for --stdio2 (Arnaldo Carvalho de Melo)

- Use the resolved variable names from objdump disassembled lines to
  make them more compact, just like was already done for some instructions,
  like "mov", this eventually will be done more generally, but lets now add
  some more to the existing mechanism (Arnaldo Carvalho de Melo)

perf record fixes:

- Change warning for missing topology sysfs entry to debug, as not all
  architectures have those files, s390 being one of those (Thomas Richter)

perf sched fixes:

- Fix -g/--call-graph documentation (Takuya Yamamoto)

perf stat:

- Enable 1ms interval for printing event counters values in (Alexey Budankov)

perf test fixes:

- Run dwarf unwind  on arm32 (Kim Phillips)

- Remove unused ptrace.h include from LLVM test, sidesteping older
  clang's lack of support for some asm constructs (Arnaldo Carvalho de Melo)

perf version fixes:

- Do not print info about HAVE_LIBAUDIT_SUPPORT in 'perf version --build-options'
  when HAVE_SYSCALL_TABLE_SUPPORT is true, as libaudit won't be used in that
  case, print info about syscall_table support instead (Jin Yao)

Build system fixes:

- Use HAVE_..._SUPPORT used consistently (Jin Yao)

- Restore READ_ONCE() C++ compatibility in tools/include (Mark Rutland)

- Give hints about package names needed to build jvmti (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

7 files changed, 41 insertions, 17 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index fbad8dfbb186..536ee148bff8 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -46,6 +46,7 @@
 struct annotation_options annotation__default_options = {
         .use_offset     = true,
         .jump_arrows    = true,
+        .offset_level   = ANNOTATION__OFFSET_JUMP_TARGETS,
 };
 
 const char      *disassembler_style;
@@ -2512,7 +2513,8 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
                 if (!notes->options->use_offset) {
                         printed = scnprintf(bf, sizeof(bf), "%" PRIx64 ": ", addr);
                 } else {
-                        if (al->jump_sources) {
+                        if (al->jump_sources &&
+                            notes->options->offset_level >= ANNOTATION__OFFSET_JUMP_TARGETS) {
                                 if (notes->options->show_nr_jumps) {
                                         int prev;
                                         printed = scnprintf(bf, sizeof(bf), "%*d ",
@@ -2523,9 +2525,14 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
                                         obj__printf(obj, bf);
                                         obj__set_color(obj, prev);
                                 }
-
+print_addr:
                                 printed = scnprintf(bf, sizeof(bf), "%*" PRIx64 ": ",
                                                     notes->widths.target, addr);
+                        } else if (ins__is_call(&disasm_line(al)->ins) &&
+                                   notes->options->offset_level >= ANNOTATION__OFFSET_CALL) {
+                                goto print_addr;
+                        } else if (notes->options->offset_level == ANNOTATION__MAX_OFFSET_LEVEL) {
+                                goto print_addr;
                         } else {
                                 printed = scnprintf(bf, sizeof(bf), "%-*s  ",
                                                     notes->widths.addr, " ");
@@ -2642,10 +2649,11 @@ int __annotation__scnprintf_samples_period(struct annotation *notes,
  */
 static struct annotation_config {
         const char *name;
-        bool *value;
+        void *value;
 } annotation__configs[] = {
         ANNOTATION__CFG(hide_src_code),
         ANNOTATION__CFG(jump_arrows),
+        ANNOTATION__CFG(offset_level),
         ANNOTATION__CFG(show_linenr),
         ANNOTATION__CFG(show_nr_jumps),
         ANNOTATION__CFG(show_nr_samples),
@@ -2677,8 +2685,16 @@ static int annotation__config(const char *var, const char *value,
 
         if (cfg == NULL)
                 pr_debug("%s variable unknown, ignoring...", var);
-        else
-                *cfg->value = perf_config_bool(name, value);
+        else if (strcmp(var, "annotate.offset_level") == 0) {
+                perf_config_int(cfg->value, name, value);
+
+                if (*(int *)cfg->value > ANNOTATION__MAX_OFFSET_LEVEL)
+                        *(int *)cfg->value = ANNOTATION__MAX_OFFSET_LEVEL;
+                else if (*(int *)cfg->value < ANNOTATION__MIN_OFFSET_LEVEL)
+                        *(int *)cfg->value = ANNOTATION__MIN_OFFSET_LEVEL;
+        } else {
+                *(bool *)cfg->value = perf_config_bool(name, value);
+        }
         return 0;
 }
 
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index db8d09bea07e..f28a9e43421d 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -70,8 +70,17 @@ struct annotation_options {
              show_nr_jumps,
              show_nr_samples,
              show_total_period;
+        u8   offset_level;
 };
 
+enum {
+        ANNOTATION__OFFSET_JUMP_TARGETS = 1,
+        ANNOTATION__OFFSET_CALL,
+        ANNOTATION__MAX_OFFSET_LEVEL,
+};
+
+#define ANNOTATION__MIN_OFFSET_LEVEL ANNOTATION__OFFSET_JUMP_TARGETS
+
 extern struct annotation_options annotation__default_options;
 
 struct annotation;
diff --git a/tools/perf/util/generate-cmdlist.sh b/tools/perf/util/generate-cmdlist.sh
index ff17920a5ebc..c3cef36d4176 100755
--- a/tools/perf/util/generate-cmdlist.sh
+++ b/tools/perf/util/generate-cmdlist.sh
@@ -38,7 +38,7 @@ do
 done
 echo "#endif /* HAVE_LIBELF_SUPPORT */"
 
-echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)"
+echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)"
 sed -n -e 's/^perf-\([^         ]*\)[   ].* audit*/\1/p' command-list.txt |
 sort |
 while read cmd
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 121df1683c36..a8bff2178fbc 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1320,7 +1320,8 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
 
         dir = opendir(path);
         if (!dir) {
-                pr_warning("failed: can't open node sysfs data\n");
+                pr_debug2("%s: could't read %s, does this arch have topology information?\n",
+                          __func__, path);
                 return -1;
         }
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 62b2dd2253eb..1466814ebada 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -2091,16 +2091,14 @@ static bool symbol__read_kptr_restrict(void)
 
 int symbol__annotation_init(void)
 {
+        if (symbol_conf.init_annotation)
+                return 0;
+
         if (symbol_conf.initialized) {
                 pr_err("Annotation needs to be init before symbol__init()\n");
                 return -1;
         }
 
-        if (symbol_conf.init_annotation) {
-                pr_warning("Annotation being initialized multiple times\n");
-                return 0;
-        }
-
         symbol_conf.priv_size += sizeof(struct annotation);
         symbol_conf.init_annotation = true;
         return 0;
diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/util/syscalltbl.c
index 895122d638dd..0ee7f568d60c 100644
--- a/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <linux/compiler.h>
 
-#ifdef HAVE_SYSCALL_TABLE
+#ifdef HAVE_SYSCALL_TABLE_SUPPORT
 #include <string.h>
 #include "string2.h"
 #include "util.h"
@@ -139,7 +139,7 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g
         return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);
 }
 
-#else /* HAVE_SYSCALL_TABLE */
+#else /* HAVE_SYSCALL_TABLE_SUPPORT */
 
 #include <libaudit.h>
 
@@ -176,4 +176,4 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g
 {
         return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx);
 }
-#endif /* HAVE_SYSCALL_TABLE */
+#endif /* HAVE_SYSCALL_TABLE_SUPPORT */
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 0ac9077f62a2..b1e5c3a2b8e3 100644
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -98,7 +98,7 @@ static void register_python_scripting(struct scripting_ops *scripting_ops)
         }
 }
 
-#ifdef NO_LIBPYTHON
+#ifndef HAVE_LIBPYTHON_SUPPORT
 void setup_python_scripting(void)
 {
         register_python_scripting(&python_scripting_unsupported_ops);
@@ -161,7 +161,7 @@ static void register_perl_scripting(struct scripting_ops *scripting_ops)
         }
 }
 
-#ifdef NO_LIBPERL
+#ifndef HAVE_LIBPERL_SUPPORT
 void setup_perl_scripting(void)
 {
         register_perl_scripting(&perl_scripting_unsupported_ops);