perf symbols: Track symtab_type of vmlinux

Previously, symtab_type would have been left at 0, or KALLSYMS, which is
not quite accurate.

Introduce DSO_BINARY_TYPE__VMLINUX[_GUEST].

Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: David Hansen <dave@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Matt Hellsley <matthltc@us.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1344637382-22789-11-git-send-email-cody@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 96dbf28fc941d94a34fd196e83771c7e13d227b4..8f5cabbfc8bdcaec05f005fa0d282b0aae61e45e 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -923,6 +923,7 @@ char dso__symtab_origin(const struct dso *dso)
 {
        static const char origin[] = {
                [DSO_BINARY_TYPE__KALLSYMS]             = 'k',
+               [DSO_BINARY_TYPE__VMLINUX]              = 'v',
                [DSO_BINARY_TYPE__JAVA_JIT]             = 'j',
                [DSO_BINARY_TYPE__DEBUGLINK]            = 'l',
                [DSO_BINARY_TYPE__BUILD_ID_CACHE]       = 'B',
@@ -933,6 +934,7 @@ char dso__symtab_origin(const struct dso *dso)
                [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE]  = 'K',
                [DSO_BINARY_TYPE__GUEST_KALLSYMS]       = 'g',
                [DSO_BINARY_TYPE__GUEST_KMODULE]        = 'G',
+               [DSO_BINARY_TYPE__GUEST_VMLINUX]        = 'V',
        };
 
        if (dso == NULL || dso->symtab_type == DSO_BINARY_TYPE__NOT_FOUND)
@@ -1008,7 +1010,9 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,
 
        default:
        case DSO_BINARY_TYPE__KALLSYMS:
+       case DSO_BINARY_TYPE__VMLINUX:
        case DSO_BINARY_TYPE__GUEST_KALLSYMS:
+       case DSO_BINARY_TYPE__GUEST_VMLINUX:
        case DSO_BINARY_TYPE__JAVA_JIT:
        case DSO_BINARY_TYPE__NOT_FOUND:
                ret = -1;
@@ -1364,6 +1368,11 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
        if (fd < 0)
                return -1;
 
+       if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
+               dso->symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
+       else
+               dso->symtab_type = DSO_BINARY_TYPE__VMLINUX;
+
        err = dso__load_sym(dso, map, symfs_vmlinux, fd, filter, 0, 0);
        close(fd);
 

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index c9534fe0720de8c2f6507c3a133366bf7fce7ea7..37f1ea146c16cea14235c1280e303e7670640868 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -158,6 +158,8 @@ struct addr_location {
 enum dso_binary_type {
        DSO_BINARY_TYPE__KALLSYMS = 0,
        DSO_BINARY_TYPE__GUEST_KALLSYMS,
+       DSO_BINARY_TYPE__VMLINUX,
+       DSO_BINARY_TYPE__GUEST_VMLINUX,
        DSO_BINARY_TYPE__JAVA_JIT,
        DSO_BINARY_TYPE__DEBUGLINK,
        DSO_BINARY_TYPE__BUILD_ID_CACHE,