1 files changed, 18 insertions, 10 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 614fa9a4c67c..7bb9ca1b30fa 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -113,16 +113,24 @@ static void write_output(void *buf, size_t size)
 
 static void write_event(event_t *buf, size_t size)
 {
-        /*
-        * Add it to the list of DSOs, so that when we finish this
-         * record session we can pick the available build-ids.
-         */
-        if (buf->header.type == PERF_RECORD_MMAP) {
-                struct list_head *head = &dsos__user;
-                if (buf->mmap.header.misc == 1)
-                        head = &dsos__kernel;
-                __dsos__findnew(head, buf->mmap.filename);
-        }
+        size_t processed_size = buf->header.size;
+        event_t *ev = buf;
+
+        do {
+                /*
+                * Add it to the list of DSOs, so that when we finish this
+                 * record session we can pick the available build-ids.
+                 */
+                if (ev->header.type == PERF_RECORD_MMAP) {
+                        struct list_head *head = &dsos__user;
+                        if (ev->header.misc == 1)
+                                head = &dsos__kernel;
+                        __dsos__findnew(head, ev->mmap.filename);
+                }
+
+                ev = ((void *)ev) + ev->header.size;
+                processed_size += ev->header.size;
+        } while (processed_size < size);
 
         write_output(buf, size);
 }