perf tools: Use O_LARGEFILE to open perf data file
[safe/jmp/linux-2.6] / tools / perf / util / header.c
index ca0d657..ed3efd7 100644 (file)
@@ -1,15 +1,20 @@
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+
 #include <sys/types.h>
+#include <byteswap.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/list.h>
+#include <linux/kernel.h>
 
 #include "util.h"
 #include "header.h"
 #include "../perf.h"
 #include "trace-event.h"
+#include "session.h"
 #include "symbol.h"
-#include "data_map.h"
 #include "debug.h"
 
 /*
@@ -19,69 +24,80 @@ struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr)
 {
        struct perf_header_attr *self = malloc(sizeof(*self));
 
-       if (!self)
-               die("nomem");
-
-       self->attr = *attr;
-       self->ids = 0;
-       self->size = 1;
-       self->id = malloc(sizeof(u64));
-
-       if (!self->id)
-               die("nomem");
+       if (self != NULL) {
+               self->attr = *attr;
+               self->ids  = 0;
+               self->size = 1;
+               self->id   = malloc(sizeof(u64));
+               if (self->id == NULL) {
+                       free(self);
+                       self = NULL;
+               }
+       }
 
        return self;
 }
 
-void perf_header_attr__add_id(struct perf_header_attr *self, u64 id)
+void perf_header_attr__delete(struct perf_header_attr *self)
+{
+       free(self->id);
+       free(self);
+}
+
+int perf_header_attr__add_id(struct perf_header_attr *self, u64 id)
 {
        int pos = self->ids;
 
        self->ids++;
        if (self->ids > self->size) {
-               self->size *= 2;
-               self->id = realloc(self->id, self->size * sizeof(u64));
-               if (!self->id)
-                       die("nomem");
+               int nsize = self->size * 2;
+               u64 *nid = realloc(self->id, nsize * sizeof(u64));
+
+               if (nid == NULL)
+                       return -1;
+
+               self->size = nsize;
+               self->id = nid;
        }
        self->id[pos] = id;
+       return 0;
 }
 
-/*
- * Create new perf.data header:
- */
-struct perf_header *perf_header__new(void)
+int perf_header__init(struct perf_header *self)
 {
-       struct perf_header *self = calloc(sizeof(*self), 1);
-
-       if (!self)
-               die("nomem");
-
        self->size = 1;
        self->attr = malloc(sizeof(void *));
-
-       if (!self->attr)
-               die("nomem");
-
-       return self;
+       return self->attr == NULL ? -ENOMEM : 0;
 }
 
-void perf_header__add_attr(struct perf_header *self,
-                          struct perf_header_attr *attr)
+void perf_header__exit(struct perf_header *self)
 {
-       int pos = self->attrs;
+       int i;
+       for (i = 0; i < self->attrs; ++i)
+                perf_header_attr__delete(self->attr[i]);
+       free(self->attr);
+}
 
+int perf_header__add_attr(struct perf_header *self,
+                         struct perf_header_attr *attr)
+{
        if (self->frozen)
-               die("frozen");
-
-       self->attrs++;
-       if (self->attrs > self->size) {
-               self->size *= 2;
-               self->attr = realloc(self->attr, self->size * sizeof(void *));
-               if (!self->attr)
-                       die("nomem");
+               return -1;
+
+       if (self->attrs == self->size) {
+               int nsize = self->size * 2;
+               struct perf_header_attr **nattr;
+
+               nattr = realloc(self->attr, nsize * sizeof(void *));
+               if (nattr == NULL)
+                       return -1;
+
+               self->size = nsize;
+               self->attr = nattr;
        }
-       self->attr[pos] = attr;
+
+       self->attr[self->attrs++] = attr;
+       return 0;
 }
 
 #define MAX_EVENT_NAME 64
@@ -94,24 +110,28 @@ struct perf_trace_event_type {
 static int event_count;
 static struct perf_trace_event_type *events;
 
-void perf_header__push_event(u64 id, const char *name)
+int perf_header__push_event(u64 id, const char *name)
 {
        if (strlen(name) > MAX_EVENT_NAME)
                pr_warning("Event %s will be truncated\n", name);
 
        if (!events) {
                events = malloc(sizeof(struct perf_trace_event_type));
-               if (!events)
-                       die("nomem");
+               if (events == NULL)
+                       return -ENOMEM;
        } else {
-               events = realloc(events, (event_count + 1) * sizeof(struct perf_trace_event_type));
-               if (!events)
-                       die("nomem");
+               struct perf_trace_event_type *nevents;
+
+               nevents = realloc(events, (event_count + 1) * sizeof(*events));
+               if (nevents == NULL)
+                       return -ENOMEM;
+               events = nevents;
        }
        memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));
        events[event_count].event_id = id;
        strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);
        event_count++;
+       return 0;
 }
 
 char *perf_header__find_event(u64 id)
@@ -128,26 +148,11 @@ static const char *__perf_magic = "PERFFILE";
 
 #define PERF_MAGIC     (*(u64 *)__perf_magic)
 
-struct perf_file_section {
-       u64 offset;
-       u64 size;
-};
-
 struct perf_file_attr {
        struct perf_event_attr  attr;
        struct perf_file_section        ids;
 };
 
-struct perf_file_header {
-       u64                             magic;
-       u64                             size;
-       u64                             attr_size;
-       struct perf_file_section        attrs;
-       struct perf_file_section        data;
-       struct perf_file_section        event_types;
-       DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
-};
-
 void perf_header__set_feat(struct perf_header *self, int feat)
 {
        set_bit(feat, self->adds_features);
@@ -158,58 +163,229 @@ bool perf_header__has_feat(const struct perf_header *self, int feat)
        return test_bit(feat, self->adds_features);
 }
 
-static void do_write(int fd, void *buf, size_t size)
+static int do_write(int fd, const void *buf, size_t size)
 {
        while (size) {
                int ret = write(fd, buf, size);
 
                if (ret < 0)
-                       die("failed to write");
+                       return -errno;
 
                size -= ret;
                buf += ret;
        }
+
+       return 0;
+}
+
+#define NAME_ALIGN 64
+
+static int write_padded(int fd, const void *bf, size_t count,
+                       size_t count_aligned)
+{
+       static const char zero_buf[NAME_ALIGN];
+       int err = do_write(fd, bf, count);
+
+       if (!err)
+               err = do_write(fd, zero_buf, count_aligned - count);
+
+       return err;
 }
 
-static void write_buildid_table(int fd, struct list_head *id_head)
+#define dsos__for_each_with_build_id(pos, head)        \
+       list_for_each_entry(pos, head, node)    \
+               if (!pos->has_build_id)         \
+                       continue;               \
+               else
+
+static int __dsos__write_buildid_table(struct list_head *head, u16 misc, int fd)
 {
-       struct build_id_list *iter, *next;
+       struct dso *pos;
+
+       dsos__for_each_with_build_id(pos, head) {
+               int err;
+               struct build_id_event b;
+               size_t len = pos->long_name_len + 1;
+
+               len = ALIGN(len, NAME_ALIGN);
+               memset(&b, 0, sizeof(b));
+               memcpy(&b.build_id, pos->build_id, sizeof(pos->build_id));
+               b.header.misc = misc;
+               b.header.size = sizeof(b) + len;
+               err = do_write(fd, &b, sizeof(b));
+               if (err < 0)
+                       return err;
+               err = write_padded(fd, pos->long_name,
+                                  pos->long_name_len + 1, len);
+               if (err < 0)
+                       return err;
+       }
+
+       return 0;
+}
 
-       list_for_each_entry_safe(iter, next, id_head, list) {
-               struct build_id_event *b = &iter->event;
+static int dsos__write_buildid_table(int fd)
+{
+       int err = __dsos__write_buildid_table(&dsos__kernel,
+                                             PERF_RECORD_MISC_KERNEL, fd);
+       if (err == 0)
+               err = __dsos__write_buildid_table(&dsos__user,
+                                                 PERF_RECORD_MISC_USER, fd);
+       return err;
+}
 
-               do_write(fd, b, sizeof(*b));
-               do_write(fd, (void *)iter->dso_name, iter->len);
-               list_del(&iter->list);
-               free(iter);
+int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
+                         const char *name, bool is_kallsyms)
+{
+       const size_t size = PATH_MAX;
+       char *filename = malloc(size),
+            *linkname = malloc(size), *targetname;
+       int len, err = -1;
+
+       if (filename == NULL || linkname == NULL)
+               goto out_free;
+
+       len = snprintf(filename, size, "%s%s%s",
+                      debugdir, is_kallsyms ? "/" : "", name);
+       if (mkdir_p(filename, 0755))
+               goto out_free;
+
+       snprintf(filename + len, sizeof(filename) - len, "/%s", sbuild_id);
+
+       if (access(filename, F_OK)) {
+               if (is_kallsyms) {
+                        if (copyfile("/proc/kallsyms", filename))
+                               goto out_free;
+               } else if (link(name, filename) && copyfile(name, filename))
+                       goto out_free;
        }
+
+       len = snprintf(linkname, size, "%s/.build-id/%.2s",
+                      debugdir, sbuild_id);
+
+       if (access(linkname, X_OK) && mkdir_p(linkname, 0755))
+               goto out_free;
+
+       snprintf(linkname + len, size - len, "/%s", sbuild_id + 2);
+       targetname = filename + strlen(debugdir) - 5;
+       memcpy(targetname, "../..", 5);
+
+       if (symlink(targetname, linkname) == 0)
+               err = 0;
+out_free:
+       free(filename);
+       free(linkname);
+       return err;
+}
+
+static int build_id_cache__add_b(const u8 *build_id, size_t build_id_size,
+                                const char *name, const char *debugdir,
+                                bool is_kallsyms)
+{
+       char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+
+       build_id__sprintf(build_id, build_id_size, sbuild_id);
+
+       return build_id_cache__add_s(sbuild_id, debugdir, name, is_kallsyms);
+}
+
+int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir)
+{
+       const size_t size = PATH_MAX;
+       char *filename = malloc(size),
+            *linkname = malloc(size);
+       int err = -1;
+
+       if (filename == NULL || linkname == NULL)
+               goto out_free;
+
+       snprintf(linkname, size, "%s/.build-id/%.2s/%s",
+                debugdir, sbuild_id, sbuild_id + 2);
+
+       if (access(linkname, F_OK))
+               goto out_free;
+
+       if (readlink(linkname, filename, size) < 0)
+               goto out_free;
+
+       if (unlink(linkname))
+               goto out_free;
+
+       /*
+        * Since the link is relative, we must make it absolute:
+        */
+       snprintf(linkname, size, "%s/.build-id/%.2s/%s",
+                debugdir, sbuild_id, filename);
+
+       if (unlink(linkname))
+               goto out_free;
+
+       err = 0;
+out_free:
+       free(filename);
+       free(linkname);
+       return err;
+}
+
+static int dso__cache_build_id(struct dso *self, const char *debugdir)
+{
+       bool is_kallsyms = self->kernel && self->long_name[0] != '/';
+
+       return build_id_cache__add_b(self->build_id, sizeof(self->build_id),
+                                    self->long_name, debugdir, is_kallsyms);
+}
+
+static int __dsos__cache_build_ids(struct list_head *head, const char *debugdir)
+{
+       struct dso *pos;
+       int err = 0;
+
+       dsos__for_each_with_build_id(pos, head)
+               if (dso__cache_build_id(pos, debugdir))
+                       err = -1;
+
+       return err;
 }
 
-static void
-perf_header__adds_write(struct perf_header *self, int fd)
+static int dsos__cache_build_ids(void)
+{
+       int err_kernel, err_user;
+       char debugdir[PATH_MAX];
+
+       snprintf(debugdir, sizeof(debugdir), "%s/%s", getenv("HOME"),
+                DEBUG_CACHE_DIR);
+
+       if (mkdir(debugdir, 0755) != 0 && errno != EEXIST)
+               return -1;
+
+       err_kernel = __dsos__cache_build_ids(&dsos__kernel, debugdir);
+       err_user   = __dsos__cache_build_ids(&dsos__user, debugdir);
+       return err_kernel || err_user ? -1 : 0;
+}
+
+static int perf_header__adds_write(struct perf_header *self, int fd)
 {
-       LIST_HEAD(id_list);
        int nr_sections;
        struct perf_file_section *feat_sec;
        int sec_size;
        u64 sec_start;
-       int idx = 0;
+       int idx = 0, err;
 
-       if (fetch_build_id_table(&id_list))
+       if (dsos__read_build_ids())
                perf_header__set_feat(self, HEADER_BUILD_ID);
 
        nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
        if (!nr_sections)
-               return;
+               return 0;
 
        feat_sec = calloc(sizeof(*feat_sec), nr_sections);
-       if (!feat_sec)
-               die("No memory");
+       if (feat_sec == NULL)
+               return -ENOMEM;
 
        sec_size = sizeof(*feat_sec) * nr_sections;
 
        sec_start = self->data_offset + self->data_size;
-       lseek(fd, sec_start + sec_size, SEEK_SET);
+       lseek64(fd, sec_start + sec_size, SEEK_SET);
 
        if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
                struct perf_file_section *trace_sec;
@@ -217,9 +393,9 @@ perf_header__adds_write(struct perf_header *self, int fd)
                trace_sec = &feat_sec[idx++];
 
                /* Write trace info */
-               trace_sec->offset = lseek(fd, 0, SEEK_CUR);
+               trace_sec->offset = lseek64(fd, 0, SEEK_CUR);
                read_tracing_data(fd, attrs, nr_counters);
-               trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset;
+               trace_sec->size = lseek64(fd, 0, SEEK_CUR) - trace_sec->offset;
        }
 
 
@@ -229,22 +405,32 @@ perf_header__adds_write(struct perf_header *self, int fd)
                buildid_sec = &feat_sec[idx++];
 
                /* Write build-ids */
-               buildid_sec->offset = lseek(fd, 0, SEEK_CUR);
-               write_buildid_table(fd, &id_list);
-               buildid_sec->size = lseek(fd, 0, SEEK_CUR) - buildid_sec->offset;
+               buildid_sec->offset = lseek64(fd, 0, SEEK_CUR);
+               err = dsos__write_buildid_table(fd);
+               if (err < 0) {
+                       pr_debug("failed to write buildid table\n");
+                       goto out_free;
+               }
+               buildid_sec->size = lseek64(fd, 0, SEEK_CUR) -
+                                           buildid_sec->offset;
+               dsos__cache_build_ids();
        }
 
-       lseek(fd, sec_start, SEEK_SET);
-       do_write(fd, feat_sec, sec_size);
+       lseek64(fd, sec_start, SEEK_SET);
+       err = do_write(fd, feat_sec, sec_size);
+       if (err < 0)
+               pr_debug("failed to write feature section\n");
+out_free:
        free(feat_sec);
+       return err;
 }
 
-void perf_header__write(struct perf_header *self, int fd, bool at_exit)
+int perf_header__write(struct perf_header *self, int fd, bool at_exit)
 {
        struct perf_file_header f_header;
        struct perf_file_attr   f_attr;
        struct perf_header_attr *attr;
-       int i;
+       int i, err;
 
        lseek(fd, sizeof(f_header), SEEK_SET);
 
@@ -253,7 +439,11 @@ void perf_header__write(struct perf_header *self, int fd, bool at_exit)
                attr = self->attr[i];
 
                attr->id_offset = lseek(fd, 0, SEEK_CUR);
-               do_write(fd, attr->id, attr->ids * sizeof(u64));
+               err = do_write(fd, attr->id, attr->ids * sizeof(u64));
+               if (err < 0) {
+                       pr_debug("failed to write perf header\n");
+                       return err;
+               }
        }
 
 
@@ -269,18 +459,30 @@ void perf_header__write(struct perf_header *self, int fd, bool at_exit)
                                .size   = attr->ids * sizeof(u64),
                        }
                };
-               do_write(fd, &f_attr, sizeof(f_attr));
+               err = do_write(fd, &f_attr, sizeof(f_attr));
+               if (err < 0) {
+                       pr_debug("failed to write perf header attribute\n");
+                       return err;
+               }
        }
 
        self->event_offset = lseek(fd, 0, SEEK_CUR);
        self->event_size = event_count * sizeof(struct perf_trace_event_type);
-       if (events)
-               do_write(fd, events, self->event_size);
+       if (events) {
+               err = do_write(fd, events, self->event_size);
+               if (err < 0) {
+                       pr_debug("failed to write perf header events\n");
+                       return err;
+               }
+       }
 
        self->data_offset = lseek(fd, 0, SEEK_CUR);
 
-       if (at_exit)
-               perf_header__adds_write(self, fd);
+       if (at_exit) {
+               err = perf_header__adds_write(self, fd);
+               if (err < 0)
+                       return err;
+       }
 
        f_header = (struct perf_file_header){
                .magic     = PERF_MAGIC,
@@ -303,92 +505,173 @@ void perf_header__write(struct perf_header *self, int fd, bool at_exit)
        memcpy(&f_header.adds_features, &self->adds_features, sizeof(self->adds_features));
 
        lseek(fd, 0, SEEK_SET);
-       do_write(fd, &f_header, sizeof(f_header));
-       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
+       err = do_write(fd, &f_header, sizeof(f_header));
+       if (err < 0) {
+               pr_debug("failed to write perf header\n");
+               return err;
+       }
+       lseek64(fd, self->data_offset + self->data_size, SEEK_SET);
 
        self->frozen = 1;
+       return 0;
 }
 
-static void do_read(int fd, void *buf, size_t size)
+static int do_read(int fd, void *buf, size_t size)
 {
        while (size) {
                int ret = read(fd, buf, size);
 
-               if (ret < 0)
-                       die("failed to read");
-               if (ret == 0)
-                       die("failed to read: missing data");
+               if (ret <= 0)
+                       return -1;
 
                size -= ret;
                buf += ret;
        }
+
+       return 0;
 }
 
-static void perf_header__adds_read(struct perf_header *self, int fd)
+static int perf_header__getbuffer64(struct perf_header *self,
+                                   int fd, void *buf, size_t size)
+{
+       if (do_read(fd, buf, size))
+               return -1;
+
+       if (self->needs_swap)
+               mem_bswap_64(buf, size);
+
+       return 0;
+}
+
+int perf_header__process_sections(struct perf_header *self, int fd,
+                                 int (*process)(struct perf_file_section *self,
+                                                struct perf_header *ph,
+                                                int feat, int fd))
 {
        struct perf_file_section *feat_sec;
        int nr_sections;
        int sec_size;
        int idx = 0;
-
+       int err = -1, feat = 1;
 
        nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
        if (!nr_sections)
-               return;
+               return 0;
 
        feat_sec = calloc(sizeof(*feat_sec), nr_sections);
        if (!feat_sec)
-               die("No memory");
+               return -1;
 
        sec_size = sizeof(*feat_sec) * nr_sections;
 
-       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
+       lseek64(fd, self->data_offset + self->data_size, SEEK_SET);
 
-       do_read(fd, feat_sec, sec_size);
+       if (perf_header__getbuffer64(self, fd, feat_sec, sec_size))
+               goto out_free;
 
-       if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
-               struct perf_file_section *trace_sec;
+       err = 0;
+       while (idx < nr_sections && feat < HEADER_LAST_FEATURE) {
+               if (perf_header__has_feat(self, feat)) {
+                       struct perf_file_section *sec = &feat_sec[idx++];
 
-               trace_sec = &feat_sec[idx++];
-               lseek(fd, trace_sec->offset, SEEK_SET);
-               trace_report(fd);
+                       err = process(sec, self, feat, fd);
+                       if (err < 0)
+                               break;
+               }
+               ++feat;
        }
+out_free:
+       free(feat_sec);
+       return err;
+}
 
-       if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
-               struct perf_file_section *buildid_sec;
+int perf_file_header__read(struct perf_file_header *self,
+                          struct perf_header *ph, int fd)
+{
+       lseek(fd, 0, SEEK_SET);
 
-               buildid_sec = &feat_sec[idx++];
-               lseek(fd, buildid_sec->offset, SEEK_SET);
-               if (perf_header__read_build_ids(fd, buildid_sec->offset, buildid_sec->size))
-                       pr_debug("failed to read buildids, continuing...\n");
+       if (do_read(fd, self, sizeof(*self)) ||
+           memcmp(&self->magic, __perf_magic, sizeof(self->magic)))
+               return -1;
+
+       if (self->attr_size != sizeof(struct perf_file_attr)) {
+               u64 attr_size = bswap_64(self->attr_size);
+
+               if (attr_size != sizeof(struct perf_file_attr))
+                       return -1;
+
+               mem_bswap_64(self, offsetof(struct perf_file_header,
+                                           adds_features));
+               ph->needs_swap = true;
        }
 
-       free(feat_sec);
-};
+       if (self->size != sizeof(*self)) {
+               /* Support the previous format */
+               if (self->size == offsetof(typeof(*self), adds_features))
+                       bitmap_zero(self->adds_features, HEADER_FEAT_BITS);
+               else
+                       return -1;
+       }
+
+       memcpy(&ph->adds_features, &self->adds_features,
+              sizeof(ph->adds_features));
+       /*
+        * FIXME: hack that assumes that if we need swap the perf.data file
+        * may be coming from an arch with a different word-size, ergo different
+        * DEFINE_BITMAP format, investigate more later, but for now its mostly
+        * safe to assume that we have a build-id section. Trace files probably
+        * have several other issues in this realm anyway...
+        */
+       if (ph->needs_swap) {
+               memset(&ph->adds_features, 0, sizeof(ph->adds_features));
+               perf_header__set_feat(ph, HEADER_BUILD_ID);
+       }
 
-struct perf_header *perf_header__read(int fd)
+       ph->event_offset = self->event_types.offset;
+       ph->event_size   = self->event_types.size;
+       ph->data_offset  = self->data.offset;
+       ph->data_size    = self->data.size;
+       return 0;
+}
+
+static int perf_file_section__process(struct perf_file_section *self,
+                                     struct perf_header *ph,
+                                     int feat, int fd)
 {
-       struct perf_header      *self = perf_header__new();
-       struct perf_file_header f_header;
-       struct perf_file_attr   f_attr;
-       u64                     f_id;
+       if (lseek64(fd, self->offset, SEEK_SET) < 0) {
+               pr_debug("Failed to lseek to %Ld offset for feature %d, "
+                        "continuing...\n", self->offset, feat);
+               return 0;
+       }
 
-       int nr_attrs, nr_ids, i, j;
+       switch (feat) {
+       case HEADER_TRACE_INFO:
+               trace_report(fd);
+               break;
+
+       case HEADER_BUILD_ID:
+               if (perf_header__read_build_ids(ph, fd, self->offset, self->size))
+                       pr_debug("Failed to read buildids, continuing...\n");
+               break;
+       default:
+               pr_debug("unknown feature %d, continuing...\n", feat);
+       }
 
-       lseek(fd, 0, SEEK_SET);
-       do_read(fd, &f_header, sizeof(f_header));
+       return 0;
+}
 
-       if (f_header.magic      != PERF_MAGIC           ||
-           f_header.attr_size  != sizeof(f_attr))
-               die("incompatible file format");
+int perf_header__read(struct perf_header *self, int fd)
+{
+       struct perf_file_header f_header;
+       struct perf_file_attr   f_attr;
+       u64                     f_id;
+       int nr_attrs, nr_ids, i, j;
 
-       if (f_header.size != sizeof(f_header)) {
-               /* Support the previous format */
-               if (f_header.size == offsetof(typeof(f_header), adds_features))
-                       bitmap_zero(f_header.adds_features, HEADER_FEAT_BITS);
-               else
-                       die("incompatible file format");
+       if (perf_file_header__read(&f_header, self, fd) < 0) {
+               pr_debug("incompatible file format\n");
+               return -EINVAL;
        }
+
        nr_attrs = f_header.attrs.size / sizeof(f_attr);
        lseek(fd, f_header.attrs.offset, SEEK_SET);
 
@@ -396,47 +679,54 @@ struct perf_header *perf_header__read(int fd)
                struct perf_header_attr *attr;
                off_t tmp;
 
-               do_read(fd, &f_attr, sizeof(f_attr));
+               if (perf_header__getbuffer64(self, fd, &f_attr, sizeof(f_attr)))
+                       goto out_errno;
+
                tmp = lseek(fd, 0, SEEK_CUR);
 
                attr = perf_header_attr__new(&f_attr.attr);
+               if (attr == NULL)
+                        return -ENOMEM;
 
                nr_ids = f_attr.ids.size / sizeof(u64);
                lseek(fd, f_attr.ids.offset, SEEK_SET);
 
                for (j = 0; j < nr_ids; j++) {
-                       do_read(fd, &f_id, sizeof(f_id));
+                       if (perf_header__getbuffer64(self, fd, &f_id, sizeof(f_id)))
+                               goto out_errno;
 
-                       perf_header_attr__add_id(attr, f_id);
+                       if (perf_header_attr__add_id(attr, f_id) < 0) {
+                               perf_header_attr__delete(attr);
+                               return -ENOMEM;
+                       }
+               }
+               if (perf_header__add_attr(self, attr) < 0) {
+                       perf_header_attr__delete(attr);
+                       return -ENOMEM;
                }
-               perf_header__add_attr(self, attr);
+
                lseek(fd, tmp, SEEK_SET);
        }
 
        if (f_header.event_types.size) {
                lseek(fd, f_header.event_types.offset, SEEK_SET);
                events = malloc(f_header.event_types.size);
-               if (!events)
-                       die("nomem");
-               do_read(fd, events, f_header.event_types.size);
+               if (events == NULL)
+                       return -ENOMEM;
+               if (perf_header__getbuffer64(self, fd, events,
+                                            f_header.event_types.size))
+                       goto out_errno;
                event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);
        }
 
-       memcpy(&self->adds_features, &f_header.adds_features, sizeof(f_header.adds_features));
-
-       self->event_offset = f_header.event_types.offset;
-       self->event_size   = f_header.event_types.size;
-
-       self->data_offset = f_header.data.offset;
-       self->data_size   = f_header.data.size;
-
-       perf_header__adds_read(self, fd);
+       perf_header__process_sections(self, fd, perf_file_section__process);
 
        lseek(fd, self->data_offset, SEEK_SET);
 
        self->frozen = 1;
-
-       return self;
+       return 0;
+out_errno:
+       return -errno;
 }
 
 u64 perf_header__sample_type(struct perf_header *header)