]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
perf session: Skip unsupported new event types
authorChun-Tse Shao <ctshao@google.com>
Mon, 14 Apr 2025 17:38:56 +0000 (10:38 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 25 Apr 2025 15:32:01 +0000 (12:32 -0300)
`perf report` currently halts with an error when encountering
unsupported new event types (`event.type >= PERF_RECORD_HEADER_MAX`).

This patch modifies the behavior to skip these samples and continue
processing the remaining events.

Additionally, stops reporting if the new event size is not 8-byte
aligned.

Suggested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Chun-Tse Shao <ctshao@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250414173921.2905822-1-ctshao@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/session.c

index 60fb9997ea0d11ceb9f98e5e153e72e84f97c148..81cc56503a2d0f51d87a6905937098c7f9ebb28a 100644 (file)
@@ -1639,8 +1639,17 @@ static s64 perf_session__process_event(struct perf_session *session,
        if (session->header.needs_swap)
                event_swap(event, evlist__sample_id_all(evlist));
 
-       if (event->header.type >= PERF_RECORD_HEADER_MAX)
-               return -EINVAL;
+       if (event->header.type >= PERF_RECORD_HEADER_MAX) {
+               /* perf should not support unaligned event, stop here. */
+               if (event->header.size % sizeof(u64))
+                       return -EINVAL;
+
+               /* This perf is outdated and does not support the latest event type. */
+               ui__warning("Unsupported header type %u, please consider updating perf.\n",
+                           event->header.type);
+               /* Skip unsupported event by returning its size. */
+               return event->header.size;
+       }
 
        events_stats__inc(&evlist->stats, event->header.type);