Commit c7a867aa authored Aug 18, 2022 by Namhyung Kim Committed by sanglipeng Apr 24, 2024

tools headers UAPI: Sync linux/perf_event.h with the kernel sources

stable inclusion
from stable-v5.10.204
commit a8b781c410a5987dd16b4d81e1269b4ff68c5dc2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a8b781c410a5987dd16b4d81e1269b4ff68c5dc2



--------------------------------

commit 65ba872a upstream.

To pick the trivial change in:

  119a784c ("perf/core: Add a new read format to get a number of lost samples")

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220819003644.508916-2-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent ca7becef

tools/include/uapi/linux/perf_event.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ enum {
		* { u64 time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
		* { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
		* { u64 id; } && PERF_FORMAT_ID
		* { u64 lost; } && PERF_FORMAT_LOST
		* } && !PERF_FORMAT_GROUP
		*
		* { u64 nr;
		@@ -324,6 +325,7 @@ enum {
		* { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
		* { u64 value;
		* { u64 id; } && PERF_FORMAT_ID
		* { u64 lost; } && PERF_FORMAT_LOST
		* } cntr[nr];
		* } && PERF_FORMAT_GROUP
		* };
		@@ -333,8 +335,9 @@ enum perf_event_read_format {
		PERF_FORMAT_TOTAL_TIME_RUNNING = 1U << 1,
		PERF_FORMAT_ID = 1U << 2,
		PERF_FORMAT_GROUP = 1U << 3,
		PERF_FORMAT_LOST = 1U << 4,

		PERF_FORMAT_MAX = 1U << 4, /* non-ABI */
		PERF_FORMAT_MAX = 1U << 5, /* non-ABI */
		};

		#define PERF_ATTR_SIZE_VER0 64 /* sizeof first published struct */