]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
perf tools: Decompress kernel module when reading DSO data
authorNamhyung Kim <namhyung@kernel.org>
Thu, 8 Jun 2017 07:31:05 +0000 (16:31 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 8 Jun 2017 18:39:07 +0000 (15:39 -0300)
Currently perf decompresses kernel modules when loading the symbol table
but it missed to do it when reading raw data.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: kernel-team@lge.com
Link: http://lkml.kernel.org/r/20170608073109.30699-6-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/dso.c

index b346b8eba65c0ab63c7d6acdd35428535011b90f..c63525d845c5f5f46380287b9f7625a661ba9373 100644 (file)
@@ -475,7 +475,23 @@ static int __open_dso(struct dso *dso, struct machine *machine)
                return -EINVAL;
        }
 
+       if (dso__needs_decompress(dso)) {
+               char newpath[KMOD_DECOMP_LEN];
+               size_t len = sizeof(newpath);
+
+               if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) {
+                       free(name);
+                       return -dso->load_errno;
+               }
+
+               strcpy(name, newpath);
+       }
+
        fd = do_open(name);
+
+       if (dso__needs_decompress(dso))
+               unlink(name);
+
        free(name);
        return fd;
 }