perf tools: Fix ommitted mmap data update on remap

Commit eac9eacee16 "perf tools: Check we are able to read the event
size on mmap" brought a check to ensure we can read the size of the
event before dereferencing it, and do a remap otherwise to move the
buffer forward.

However that remap was ommitting all the necessary work to
update the new page offset, head, and to unmap previous pages,
etc...

To fix this, gather all the code that fetches the event in a
seperate helper which does all the necessary checks about the
header/event size and tells us anytime a remap is needed.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1306148788-6179-3-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 26 insertions, 13 deletions

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 948327d9e92b..64500fc78799 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -960,6 +960,30 @@ out_err:
         return err;
 }
 
+static union perf_event *
+fetch_mmaped_event(struct perf_session *session,
+                   u64 head, size_t mmap_size, char *buf)
+{
+        union perf_event *event;
+
+        /*
+         * Ensure we have enough space remaining to read
+         * the size of the event in the headers.
+         */
+        if (head + sizeof(event->header) > mmap_size)
+                return NULL;
+
+        event = (union perf_event *)(buf + head);
+
+        if (session->header.needs_swap)
+                perf_event_header__bswap(&event->header);
+
+        if (head + event->header.size > mmap_size)
+                return NULL;
+
+        return event;
+}
+
 int __perf_session__process_events(struct perf_session *session,
                                    u64 data_offset, u64 data_size,
                                    u64 file_size, struct perf_event_ops *ops)
@@ -1014,19 +1038,8 @@ remap:
         file_pos = file_offset + head;
 
 more:
-        /*
-         * Ensure we have enough space remaining to read
-         * the size of the event in the headers.
-         */
-        if (head + sizeof(event->header) > mmap_size)
-                goto remap;
-
-        event = (union perf_event *)(buf + head);
-
-        if (session->header.needs_swap)
-                perf_event_header__bswap(&event->header);
-
-        if (head + event->header.size > mmap_size) {
+        event = fetch_mmaped_event(session, head, mmap_size, buf);
+        if (!event) {
                 if (mmaps[map_idx]) {
                         munmap(mmaps[map_idx], mmap_size);
                         mmaps[map_idx] = NULL;