perf tools: Do not seek in pipe fd during tracing data processing

There's no need to set 'fd' position in pipe mode, the file descriptor
is already in proper place. Moreover the lseek will fail on pipe
descriptor and that's why it's been working properly.

I was tempted to remove the lseek calls completely, because it seems
that tracing data event was always synthesized only in pipe mode, so
there's no need for 'file' mode handling. But I guess there was a reason
behind this and there might (however unlikely) be a perf.data that we
could break processing for.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Khuong <pvk@pvk.ca>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200507095024.2789147-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 0ce47283a8a133e1b64218cc5b437f7fb96f9cc8..13a1fe4ac0c04cfcd447f50b92f4b0ddd857659e 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3947,12 +3947,22 @@ int perf_event__process_tracing_data(struct perf_session *session,
 {
        ssize_t size_read, padding, size = event->tracing_data.size;
        int fd = perf_data__fd(session->data);
-       off_t offset = lseek(fd, 0, SEEK_CUR);
        char buf[BUFSIZ];
 
-       /* setup for reading amidst mmap */
-       lseek(fd, offset + sizeof(struct perf_record_header_tracing_data),
-             SEEK_SET);
+       /*
+        * The pipe fd is already in proper place and in any case
+        * we can't move it, and we'd screw the case where we read
+        * 'pipe' data from regular file. The trace_report reads
+        * data from 'fd' so we need to set it directly behind the
+        * event, where the tracing data starts.
+        */
+       if (!perf_data__is_pipe(session->data)) {
+               off_t offset = lseek(fd, 0, SEEK_CUR);
+
+               /* setup for reading amidst mmap */
+               lseek(fd, offset + sizeof(struct perf_record_header_tracing_data),
+                     SEEK_SET);
+       }
 
        size_read = trace_report(fd, &session->tevent,
                                 session->repipe);

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index c11d89e0ee55a317b090693279afeeed14cb823c..b860f9f1b09e0d1f943f726a8b44920eb7a8b312 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1542,8 +1542,13 @@ static s64 perf_session__process_user_event(struct perf_session *session,
                 */
                return 0;
        case PERF_RECORD_HEADER_TRACING_DATA:
-               /* setup for reading amidst mmap */
-               lseek(fd, file_offset, SEEK_SET);
+               /*
+                * Setup for reading amidst mmap, but only when we
+                * are in 'file' mode. The 'pipe' fd is in proper
+                * place already.
+                */
+               if (!perf_data__is_pipe(session->data))
+                       lseek(fd, file_offset, SEEK_SET);
                return tool->tracing_data(session, event);
        case PERF_RECORD_HEADER_BUILD_ID:
                return tool->build_id(session, event);