Merge tag 'perf-core-for-mingo-20160511' 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 changes:

- Fix symbol insertion and callchain behavior in db-export (Chris Phlipot)

Infrastructure changes:

- Add libunwind build test (feature query), working towards supporting
  cross-platform DWARF callchains, starting with arm/arm64 (He Kuang)

- Use lsdir() more extensively (Masami Hiramatsu)

- Use SBUILD_ID_SIZE in places where the equivalent expression was
  being used (Masami Hiramatsu)

- Split some more 'perf trace' syscall arg beautifiers (Arnaldo Carvalho de Melo)

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

13 files changed, 137 insertions, 137 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 709963740f9a..6e5c325148e4 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -41,7 +41,6 @@
 #include <libaudit.h> /* FIXME: Still needed for audit_errno_to_name */
 #include <stdlib.h>
 #include <linux/err.h>
-#include <linux/seccomp.h>
 #include <linux/filter.h>
 #include <linux/audit.h>
 #include <sys/ptrace.h>
@@ -369,37 +368,6 @@ static size_t syscall_arg__scnprintf_int(char *bf, size_t size,
 
 #define SCA_INT syscall_arg__scnprintf_int
 
-static size_t syscall_arg__scnprintf_flock(char *bf, size_t size,
-                                           struct syscall_arg *arg)
-{
-        int printed = 0, op = arg->val;
-
-        if (op == 0)
-                return scnprintf(bf, size, "NONE");
-#define P_CMD(cmd) \
-        if ((op & LOCK_##cmd) == LOCK_##cmd) { \
-                printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #cmd); \
-                op &= ~LOCK_##cmd; \
-        }
-
-        P_CMD(SH);
-        P_CMD(EX);
-        P_CMD(NB);
-        P_CMD(UN);
-        P_CMD(MAND);
-        P_CMD(RW);
-        P_CMD(READ);
-        P_CMD(WRITE);
-#undef P_OP
-
-        if (op)
-                printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", op);
-
-        return printed;
-}
-
-#define SCA_FLOCK syscall_arg__scnprintf_flock
-
 static const char *bpf_cmd[] = {
         "MAP_CREATE", "MAP_LOOKUP_ELEM", "MAP_UPDATE_ELEM", "MAP_DELETE_ELEM",
         "MAP_GET_NEXT_KEY", "PROG_LOAD",
@@ -548,57 +516,6 @@ static const char *tioctls[] = {
 static DEFINE_STRARRAY_OFFSET(tioctls, 0x5401);
 #endif /* defined(__i386__) || defined(__x86_64__) */
 
-#ifndef SECCOMP_SET_MODE_STRICT
-#define SECCOMP_SET_MODE_STRICT 0
-#endif
-#ifndef SECCOMP_SET_MODE_FILTER
-#define SECCOMP_SET_MODE_FILTER 1
-#endif
-
-static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct syscall_arg *arg)
-{
-        int op = arg->val;
-        size_t printed = 0;
-
-        switch (op) {
-#define P_SECCOMP_SET_MODE_OP(n) case SECCOMP_SET_MODE_##n: printed = scnprintf(bf, size, #n); break
-        P_SECCOMP_SET_MODE_OP(STRICT);
-        P_SECCOMP_SET_MODE_OP(FILTER);
-#undef P_SECCOMP_SET_MODE_OP
-        default: printed = scnprintf(bf, size, "%#x", op);                        break;
-        }
-
-        return printed;
-}
-
-#define SCA_SECCOMP_OP  syscall_arg__scnprintf_seccomp_op
-
-#ifndef SECCOMP_FILTER_FLAG_TSYNC
-#define SECCOMP_FILTER_FLAG_TSYNC 1
-#endif
-
-static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size,
-                                                   struct syscall_arg *arg)
-{
-        int printed = 0, flags = arg->val;
-
-#define P_FLAG(n) \
-        if (flags & SECCOMP_FILTER_FLAG_##n) { \
-                printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \
-                flags &= ~SECCOMP_FILTER_FLAG_##n; \
-        }
-
-        P_FLAG(TSYNC);
-#undef P_FLAG
-
-        if (flags)
-                printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);
-
-        return printed;
-}
-
-#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags
-
 #ifndef GRND_NONBLOCK
 #define GRND_NONBLOCK   0x0001
 #endif
@@ -634,6 +551,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,
           .arg_parm      = { [arg] = &strarray__##array, }
 
 #include "trace/beauty/eventfd.c"
+#include "trace/beauty/flock.c"
 #include "trace/beauty/futex_op.c"
 #include "trace/beauty/mmap.c"
 #include "trace/beauty/mode_t.c"
@@ -642,6 +560,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,
 #include "trace/beauty/perf_event_open.c"
 #include "trace/beauty/pid.c"
 #include "trace/beauty/sched_policy.c"
+#include "trace/beauty/seccomp.c"
 #include "trace/beauty/signum.c"
 #include "trace/beauty/socket_type.c"
 #include "trace/beauty/waitid_options.c"
diff --git a/tools/perf/trace/beauty/flock.c b/tools/perf/trace/beauty/flock.c
new file mode 100644
index 000000000000..021bb48c6336
--- /dev/null
+++ b/tools/perf/trace/beauty/flock.c
@@ -0,0 +1,31 @@
+
+static size_t syscall_arg__scnprintf_flock(char *bf, size_t size,
+                                           struct syscall_arg *arg)
+{
+        int printed = 0, op = arg->val;
+
+        if (op == 0)
+                return scnprintf(bf, size, "NONE");
+#define P_CMD(cmd) \
+        if ((op & LOCK_##cmd) == LOCK_##cmd) { \
+                printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #cmd); \
+                op &= ~LOCK_##cmd; \
+        }
+
+        P_CMD(SH);
+        P_CMD(EX);
+        P_CMD(NB);
+        P_CMD(UN);
+        P_CMD(MAND);
+        P_CMD(RW);
+        P_CMD(READ);
+        P_CMD(WRITE);
+#undef P_OP
+
+        if (op)
+                printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", op);
+
+        return printed;
+}
+
+#define SCA_FLOCK syscall_arg__scnprintf_flock
diff --git a/tools/perf/trace/beauty/seccomp.c b/tools/perf/trace/beauty/seccomp.c
new file mode 100644
index 000000000000..213c5a7e3e92
--- /dev/null
+++ b/tools/perf/trace/beauty/seccomp.c
@@ -0,0 +1,52 @@
+#include <linux/seccomp.h>
+
+#ifndef SECCOMP_SET_MODE_STRICT
+#define SECCOMP_SET_MODE_STRICT 0
+#endif
+#ifndef SECCOMP_SET_MODE_FILTER
+#define SECCOMP_SET_MODE_FILTER 1
+#endif
+
+static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct syscall_arg *arg)
+{
+        int op = arg->val;
+        size_t printed = 0;
+
+        switch (op) {
+#define P_SECCOMP_SET_MODE_OP(n) case SECCOMP_SET_MODE_##n: printed = scnprintf(bf, size, #n); break
+        P_SECCOMP_SET_MODE_OP(STRICT);
+        P_SECCOMP_SET_MODE_OP(FILTER);
+#undef P_SECCOMP_SET_MODE_OP
+        default: printed = scnprintf(bf, size, "%#x", op);                        break;
+        }
+
+        return printed;
+}
+
+#define SCA_SECCOMP_OP  syscall_arg__scnprintf_seccomp_op
+
+#ifndef SECCOMP_FILTER_FLAG_TSYNC
+#define SECCOMP_FILTER_FLAG_TSYNC 1
+#endif
+
+static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size,
+                                                   struct syscall_arg *arg)
+{
+        int printed = 0, flags = arg->val;
+
+#define P_FLAG(n) \
+        if (flags & SECCOMP_FILTER_FLAG_##n) { \
+                printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \
+                flags &= ~SECCOMP_FILTER_FLAG_##n; \
+        }
+
+        P_FLAG(TSYNC);
+#undef P_FLAG
+
+        if (flags)
+                printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);
+
+        return printed;
+}
+
+#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index d4b3d034c503..4db73d5a0dbc 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1138,7 +1138,7 @@ fallback:
 
         if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
             !dso__is_kcore(dso)) {
-                char bf[BUILD_ID_SIZE * 2 + 16] = " with build id ";
+                char bf[SBUILD_ID_SIZE + 15] = " with build id ";
                 char *build_id_msg = NULL;
 
                 if (dso->annotate_warned)
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index b6ecf87bc3e3..bff425e1232c 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -365,39 +365,17 @@ static char *build_id_cache__dirname_from_path(const char *name,
 int build_id_cache__list_build_ids(const char *pathname,
                                    struct strlist **result)
 {
-        struct strlist *list;
         char *dir_name;
-        DIR *dir;
-        struct dirent *d;
         int ret = 0;
 
-        list = strlist__new(NULL, NULL);
         dir_name = build_id_cache__dirname_from_path(pathname, false, false);
-        if (!list || !dir_name) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!dir_name)
+                return -ENOMEM;
 
-        /* List up all dirents */
-        dir = opendir(dir_name);
-        if (!dir) {
+        *result = lsdir(dir_name, lsdir_no_dot_filter);
+        if (!*result)
                 ret = -errno;
-                goto out;
-        }
-
-        while ((d = readdir(dir)) != NULL) {
-                if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
-                        continue;
-                strlist__add(list, d->d_name);
-        }
-        closedir(dir);
-
-out:
         free(dir_name);
-        if (ret)
-                strlist__delete(list);
-        else
-                *result = list;
 
         return ret;
 }
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index f8e3057ae3b1..8d96c80cc67e 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -260,8 +260,7 @@ static int db_ids_from_al(struct db_export *dbe, struct addr_location *al,
                 if (!al->sym) {
                         al->sym = symbol__new(al->addr, 0, 0, "unknown");
                         if (al->sym)
-                                symbols__insert(&dso->symbols[al->map->type],
-                                                al->sym);
+                                dso__insert_symbol(dso, al->map->type, al->sym);
                 }
 
                 if (al->sym) {
@@ -325,10 +324,11 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
                 al.sym = node->sym;
                 al.map = node->map;
                 al.machine = machine;
-                if (al.map)
-                        al.addr = al.map->map_ip(al.map, node->ip);
-                else
-                        al.addr = node->ip;
+                al.addr = node->ip;
+
+                if (al.map && !al.sym)
+                        al.sym = dso__find_symbol(al.map->dso, MAP__FUNCTION,
+                                                  al.addr);
 
                 db_ids_from_al(dbe, &al, &dso_db_id, &sym_db_id, &offset);
 
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 8e6395439ca0..3357479082ca 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -38,7 +38,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
                                    enum dso_binary_type type,
                                    char *root_dir, char *filename, size_t size)
 {
-        char build_id_hex[BUILD_ID_SIZE * 2 + 1];
+        char build_id_hex[SBUILD_ID_SIZE];
         int ret = 0;
         size_t len;
 
@@ -1301,7 +1301,7 @@ size_t __dsos__fprintf(struct list_head *head, FILE *fp)
 
 size_t dso__fprintf_buildid(struct dso *dso, FILE *fp)
 {
-        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+        char sbuild_id[SBUILD_ID_SIZE];
 
         build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
         return fprintf(fp, "%s", sbuild_id);
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c6000d44f98c..08852dde1378 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1474,7 +1474,7 @@ static int __event_process_build_id(struct build_id_event *bev,
 
         dso = machine__findnew_dso(machine, filename);
         if (dso != NULL) {
-                char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+                char sbuild_id[SBUILD_ID_SIZE];
 
                 dso__set_build_id(dso, &bev->build_id);
 
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 02c31865648b..b19bcd3b7128 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -289,7 +289,7 @@ int map__load(struct map *map, symbol_filter_t filter)
         nr = dso__load(map->dso, map, filter);
         if (nr < 0) {
                 if (map->dso->has_build_id) {
-                        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+                        char sbuild_id[SBUILD_ID_SIZE];
 
                         build_id__sprintf(map->dso->build_id,
                                           sizeof(map->dso->build_id),
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 1546b749a3a3..ff134700bf30 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -408,8 +408,11 @@ static void python_process_tracepoint(struct perf_sample *sample,
         if (!t)
                 Py_FatalError("couldn't create Python tuple");
 
-        if (!event)
-                die("ug! no event found for type %d", (int)evsel->attr.config);
+        if (!event) {
+                snprintf(handler_name, sizeof(handler_name),
+                         "ug! no event found for type %" PRIu64, (u64)evsel->attr.config);
+                Py_FatalError(handler_name);
+        }
 
         pid = raw_field_value(event, "common_pid", data);
 
@@ -615,7 +618,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,
                              struct machine *machine)
 {
         struct tables *tables = container_of(dbe, struct tables, dbe);
-        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+        char sbuild_id[SBUILD_ID_SIZE];
         PyObject *t;
 
         build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 2946295ca502..7fb33304fb4e 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -413,6 +413,18 @@ void dso__reset_find_symbol_cache(struct dso *dso)
         }
 }
 
+void dso__insert_symbol(struct dso *dso, enum map_type type, struct symbol *sym)
+{
+        symbols__insert(&dso->symbols[type], sym);
+
+        /* update the symbol cache if necessary */
+        if (dso->last_find_result[type].addr >= sym->start &&
+            (dso->last_find_result[type].addr < sym->end ||
+            sym->start == sym->end)) {
+                dso->last_find_result[type].symbol = sym;
+        }
+}
+
 struct symbol *dso__find_symbol(struct dso *dso,
                                 enum map_type type, u64 addr)
 {
@@ -1596,25 +1608,27 @@ out:
         return err;
 }
 
+static bool visible_dir_filter(const char *name, struct dirent *d)
+{
+        if (d->d_type != DT_DIR)
+                return false;
+        return lsdir_no_dot_filter(name, d);
+}
+
 static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)
 {
         char kallsyms_filename[PATH_MAX];
-        struct dirent *dent;
         int ret = -1;
-        DIR *d;
+        struct strlist *dirs;
+        struct str_node *nd;
 
-        d = opendir(dir);
-        if (!d)
+        dirs = lsdir(dir, visible_dir_filter);
+        if (!dirs)
                 return -1;
 
-        while (1) {
-                dent = readdir(d);
-                if (!dent)
-                        break;
-                if (dent->d_type != DT_DIR)
-                        continue;
+        strlist__for_each(nd, dirs) {
                 scnprintf(kallsyms_filename, sizeof(kallsyms_filename),
-                          "%s/%s/kallsyms", dir, dent->d_name);
+                          "%s/%s/kallsyms", dir, nd->s);
                 if (!validate_kcore_addresses(kallsyms_filename, map)) {
                         strlcpy(dir, kallsyms_filename, dir_sz);
                         ret = 0;
@@ -1622,7 +1636,7 @@ static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)
                 }
         }
 
-        closedir(d);
+        strlist__delete(dirs);
 
         return ret;
 }
@@ -1630,7 +1644,7 @@ static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)
 static char *dso__find_kallsyms(struct dso *dso, struct map *map)
 {
         u8 host_build_id[BUILD_ID_SIZE];
-        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+        char sbuild_id[SBUILD_ID_SIZE];
         bool is_host = false;
         char path[PATH_MAX];
 
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 07211c2f8456..2b5e4ed76fcb 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -246,6 +246,9 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map,
 int dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map,
                        symbol_filter_t filter);
 
+void dso__insert_symbol(struct dso *dso, enum map_type type,
+                        struct symbol *sym);
+
 struct symbol *dso__find_symbol(struct dso *dso, enum map_type type,
                                 u64 addr);
 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 01c9433de7ef..eab077ad6ca9 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -139,7 +139,7 @@ struct strlist *lsdir(const char *name,
 
         list = strlist__new(NULL, NULL);
         if (!list) {
-                errno = -ENOMEM;
+                errno = ENOMEM;
                 goto out;
         }