6 files changed, 202 insertions, 29 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 9a9513687235..d060fc50c8a4 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -487,7 +487,7 @@ static int __cmd_record(int argc, const char **argv)
         }
 
         if (!file_new) {
-                err = perf_header__read(&session->header, output);
+                err = perf_header__read(session, output);
                 if (err < 0)
                         return err;
         }
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 7f7cf8539cfe..5c1eba671305 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -83,6 +83,10 @@ struct build_id_event {
         char                     filename[];
 };
 
+enum perf_header_event_type { /* above any possible kernel type */
+        PERF_RECORD_HEADER_MAX                  = 64,
+};
+
 typedef union event_union {
         struct perf_event_header        header;
         struct ip_event                 ip;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 6c9aa16ee51f..8d05337d1a59 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -427,6 +427,25 @@ out_free:
         return err;
 }
 
+int perf_header__write_pipe(int fd)
+{
+        struct perf_pipe_file_header f_header;
+        int err;
+
+        f_header = (struct perf_pipe_file_header){
+                .magic     = PERF_MAGIC,
+                .size      = sizeof(f_header),
+        };
+
+        err = do_write(fd, &f_header, sizeof(f_header));
+        if (err < 0) {
+                pr_debug("failed to write perf pipe header\n");
+                return err;
+        }
+
+        return 0;
+}
+
 int perf_header__write(struct perf_header *self, int fd, bool at_exit)
 {
         struct perf_file_header f_header;
@@ -518,25 +537,10 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)
         return 0;
 }
 
-static int do_read(int fd, void *buf, size_t size)
-{
-        while (size) {
-                int ret = read(fd, buf, size);
-
-                if (ret <= 0)
-                        return -1;
-
-                size -= ret;
-                buf += ret;
-        }
-
-        return 0;
-}
-
 static int perf_header__getbuffer64(struct perf_header *self,
                                     int fd, void *buf, size_t size)
 {
-        if (do_read(fd, buf, size))
+        if (do_read(fd, buf, size) <= 0)
                 return -1;
 
         if (self->needs_swap)
@@ -592,7 +596,7 @@ int perf_file_header__read(struct perf_file_header *self,
 {
         lseek(fd, 0, SEEK_SET);
 
-        if (do_read(fd, self, sizeof(*self)) ||
+        if (do_read(fd, self, sizeof(*self)) <= 0 ||
             memcmp(&self->magic, __perf_magic, sizeof(self->magic)))
                 return -1;
 
@@ -662,13 +666,51 @@ static int perf_file_section__process(struct perf_file_section *self,
         return 0;
 }
 
-int perf_header__read(struct perf_header *self, int fd)
+static int perf_file_header__read_pipe(struct perf_pipe_file_header *self,
+                                       struct perf_header *ph, int fd)
 {
+        if (do_read(fd, self, sizeof(*self)) <= 0 ||
+            memcmp(&self->magic, __perf_magic, sizeof(self->magic)))
+                return -1;
+
+        if (self->size != sizeof(*self)) {
+                u64 size = bswap_64(self->size);
+
+                if (size != sizeof(*self))
+                        return -1;
+
+                ph->needs_swap = true;
+        }
+
+        return 0;
+}
+
+static int perf_header__read_pipe(struct perf_session *session, int fd)
+{
+        struct perf_header *self = &session->header;
+        struct perf_pipe_file_header f_header;
+
+        if (perf_file_header__read_pipe(&f_header, self, fd) < 0) {
+                pr_debug("incompatible file format\n");
+                return -EINVAL;
+        }
+
+        session->fd = fd;
+
+        return 0;
+}
+
+int perf_header__read(struct perf_session *session, int fd)
+{
+        struct perf_header *self = &session->header;
         struct perf_file_header f_header;
         struct perf_file_attr   f_attr;
         u64                     f_id;
         int nr_attrs, nr_ids, i, j;
 
+        if (session->fd_pipe)
+                return perf_header__read_pipe(session, fd);
+
         if (perf_file_header__read(&f_header, self, fd) < 0) {
                 pr_debug("incompatible file format\n");
                 return -EINVAL;
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index c059f08cf877..6562ece67064 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -39,6 +39,11 @@ struct perf_file_header {
         DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
 };
 
+struct perf_pipe_file_header {
+        u64                             magic;
+        u64                             size;
+};
+
 struct perf_header;
 
 int perf_file_header__read(struct perf_file_header *self,
@@ -60,8 +65,9 @@ struct perf_header {
 int perf_header__init(struct perf_header *self);
 void perf_header__exit(struct perf_header *self);
 
-int perf_header__read(struct perf_header *self, int fd);
+int perf_header__read(struct perf_session *session, int fd);
 int perf_header__write(struct perf_header *self, int fd, bool at_exit);
+int perf_header__write_pipe(int fd);
 
 int perf_header__add_attr(struct perf_header *self,
                           struct perf_header_attr *attr);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index ddf288fca3eb..2c1277cb4ae4 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -14,6 +14,16 @@ static int perf_session__open(struct perf_session *self, bool force)
 {
         struct stat input_stat;
 
+        if (!strcmp(self->filename, "-")) {