Merge branch 'cpuidle-fix' into fixes

[linux-2.6-microblaze.git] / tools / perf / util / dso.c

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 55c11e8..d786cf6 100644 (file)
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -11,8 +11,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#ifdef HAVE_LIBBPF_SUPPORT
 #include <bpf/libbpf.h>
 #include "bpf-event.h"
+#endif
 #include "compress.h"
 #include "env.h"
 #include "namespaces.h"
@@ -277,18 +279,12 @@ bool dso__needs_decompress(struct dso *dso)
                dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE_COMP;
 }
 
-static int decompress_kmodule(struct dso *dso, const char *name,
-                             char *pathname, size_t len)
+int filename__decompress(const char *name, char *pathname,
+                        size_t len, int comp, int *err)
 {
        char tmpbuf[] = KMOD_DECOMP_NAME;
        int fd = -1;
 
-       if (!dso__needs_decompress(dso))
-               return -1;
-
-       if (dso->comp == COMP_ID__NONE)
-               return -1;
-
        /*
         * We have proper compression id for DSO and yet the file
         * behind the 'name' can still be plain uncompressed object.
@@ -302,17 +298,17 @@ static int decompress_kmodule(struct dso *dso, const char *name,
         * To keep this transparent, we detect this and return the file
         * descriptor to the uncompressed file.
         */
-       if (!compressions[dso->comp].is_compressed(name))
+       if (!compressions[comp].is_compressed(name))
                return open(name, O_RDONLY);
 
        fd = mkstemp(tmpbuf);
        if (fd < 0) {
-               dso->load_errno = errno;
+               *err = errno;
                return -1;
        }
 
-       if (compressions[dso->comp].decompress(name, fd)) {
-               dso->load_errno = DSO_LOAD_ERRNO__DECOMPRESSION_FAILURE;
+       if (compressions[comp].decompress(name, fd)) {
+               *err = DSO_LOAD_ERRNO__DECOMPRESSION_FAILURE;
                close(fd);
                fd = -1;
        }
@@ -326,6 +322,19 @@ static int decompress_kmodule(struct dso *dso, const char *name,
        return fd;
 }
 
+static int decompress_kmodule(struct dso *dso, const char *name,
+                             char *pathname, size_t len)
+{
+       if (!dso__needs_decompress(dso))
+               return -1;
+
+       if (dso->comp == COMP_ID__NONE)
+               return -1;
+
+       return filename__decompress(name, pathname, len, dso->comp,
+                                   &dso->load_errno);
+}
+
 int dso__decompress_kmodule_fd(struct dso *dso, const char *name)
 {
        return decompress_kmodule(dso, name, NULL, 0);
@@ -728,6 +737,7 @@ bool dso__data_status_seen(struct dso *dso, enum dso_data_status_seen by)
        return false;
 }
 
+#ifdef HAVE_LIBBPF_SUPPORT
 static ssize_t bpf_read(struct dso *dso, u64 offset, char *data)
 {
        struct bpf_prog_info_node *node;
@@ -765,6 +775,7 @@ static int bpf_size(struct dso *dso)
        dso->data.file_size = node->info_linear->info.jited_prog_len;
        return 0;
 }
+#endif // HAVE_LIBBPF_SUPPORT
 
 static void
 dso_cache__free(struct dso *dso)
@@ -894,10 +905,12 @@ static struct dso_cache *dso_cache__populate(struct dso *dso,
                *ret = -ENOMEM;
                return NULL;
        }
-
+#ifdef HAVE_LIBBPF_SUPPORT
        if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)
                *ret = bpf_read(dso, cache_offset, cache->data);
-       else if (dso->binary_type == DSO_BINARY_TYPE__OOL)
+       else
+#endif
+       if (dso->binary_type == DSO_BINARY_TYPE__OOL)
                *ret = DSO__DATA_CACHE_SIZE;
        else
                *ret = file_read(dso, machine, cache_offset, cache->data);
@@ -1018,10 +1031,10 @@ int dso__data_file_size(struct dso *dso, struct machine *machine)
 
        if (dso->data.status == DSO_DATA_STATUS_ERROR)
                return -1;
-
+#ifdef HAVE_LIBBPF_SUPPORT
        if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)
                return bpf_size(dso);
-
+#endif
        return file_size(dso, machine);
 }