1 files changed, 13 insertions, 4 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index ab92763edb03..79ca6a099f96 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -22,6 +22,7 @@
 enum dso_origin {
         DSO__ORIG_KERNEL = 0,
         DSO__ORIG_JAVA_JIT,
+        DSO__ORIG_BUILD_ID_CACHE,
         DSO__ORIG_FEDORA,
         DSO__ORIG_UBUNTU,
         DSO__ORIG_BUILDID,
@@ -1191,6 +1192,7 @@ char dso__symtab_origin(const struct dso *self)
         static const char origin[] = {
                 [DSO__ORIG_KERNEL] =   'k',
                 [DSO__ORIG_JAVA_JIT] = 'j',
+                [DSO__ORIG_BUILD_ID_CACHE] = 'B',
                 [DSO__ORIG_FEDORA] =   'f',
                 [DSO__ORIG_UBUNTU] =   'u',
                 [DSO__ORIG_BUILDID] =  'b',
@@ -1209,6 +1211,7 @@ int dso__load(struct dso *self, struct map *map, struct perf_session *session,
         int size = PATH_MAX;
         char *name;
         u8 build_id[BUILD_ID_SIZE];
+        char build_id_hex[BUILD_ID_SIZE * 2 + 1];
         int ret = -1;
         int fd;
 
@@ -1230,8 +1233,16 @@ int dso__load(struct dso *self, struct map *map, struct perf_session *session,
                 return ret;
         }
 
-        self->origin = DSO__ORIG_FEDORA - 1;
+        self->origin = DSO__ORIG_BUILD_ID_CACHE;
 
+        if (self->has_build_id) {
+                build_id__sprintf(self->build_id, sizeof(self->build_id),
+                                  build_id_hex);
+                snprintf(name, size, "%s/%s/.build-id/%.2s/%s",
+                         getenv("HOME"), DEBUG_CACHE_DIR,
+                         build_id_hex, build_id_hex + 2);
+                goto open_file;
+        }
 more:
         do {
                 self->origin++;
@@ -1247,8 +1258,6 @@ more:
                 case DSO__ORIG_BUILDID:
                         if (filename__read_build_id(self->long_name, build_id,
                                                     sizeof(build_id))) {
-                                char build_id_hex[BUILD_ID_SIZE * 2 + 1];
-
                                 build_id__sprintf(build_id, sizeof(build_id),
                                                   build_id_hex);
                                 snprintf(name, size,
@@ -1276,7 +1285,7 @@ compare_build_id:
                         if (!dso__build_id_equal(self, build_id))
                                 goto more;
                 }
-
+open_file:
                 fd = open(name, O_RDONLY);
         } while (fd < 0);