Commit 03590fb4 authored Mar 27, 2020 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Apr 02, 2020

tools headers UAPI: Update tools's copy of linux/perf_event.h



To get the changes in:

  6546b19f ("perf/core: Add PERF_SAMPLE_CGROUP feature")
  96aaab68 ("perf/core: Add PERF_RECORD_CGROUP event")

This silences this perf tools build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h'
  diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h

This update is a prerequisite to adding support for the HW index of raw
branch records.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: http://lore.kernel.org/lkml/20200325124536.2800725-4-namhyung@kernel.org


[ split from a larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 6546b19f

tools/include/uapi/linux/perf_event.h

+14 −2

Original line number	Diff line number	Diff line
		@@ -142,8 +142,9 @@ enum perf_event_sample_format {
		PERF_SAMPLE_REGS_INTR = 1U << 18,
		PERF_SAMPLE_PHYS_ADDR = 1U << 19,
		PERF_SAMPLE_AUX = 1U << 20,
		PERF_SAMPLE_CGROUP = 1U << 21,

		PERF_SAMPLE_MAX = 1U << 21, /* non-ABI */
		PERF_SAMPLE_MAX = 1U << 22, /* non-ABI */

		__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
		};
		@@ -381,7 +382,8 @@ struct perf_event_attr {
		ksymbol : 1, /* include ksymbol events */
		bpf_event : 1, /* include bpf events */
		aux_output : 1, /* generate AUX records instead of events */
		__reserved_1 : 32;
		cgroup : 1, /* include cgroup events */
		__reserved_1 : 31;

		union {
		__u32 wakeup_events; /* wakeup every n events */
		@@ -1012,6 +1014,16 @@ enum perf_event_type {
		*/
		PERF_RECORD_BPF_EVENT = 18,

		/*
		* struct {
		* struct perf_event_header header;
		* u64 id;
		* char path[];
		* struct sample_id sample_id;
		* };
		*/
		PERF_RECORD_CGROUP = 19,

		PERF_RECORD_MAX, /* non-ABI */
		};

Admin message