Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

To get the changes in:

6546b19f95ac ("perf/core: Add PERF_SAMPLE_CGROUP feature")
96aaab686505 ("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>

authored by

Namhyung Kim and committed by
Arnaldo Carvalho de Melo
03590fb4 6546b19f

+14 -2
+14 -2
tools/include/uapi/linux/perf_event.h
··· 142 142 PERF_SAMPLE_REGS_INTR = 1U << 18, 143 143 PERF_SAMPLE_PHYS_ADDR = 1U << 19, 144 144 PERF_SAMPLE_AUX = 1U << 20, 145 + PERF_SAMPLE_CGROUP = 1U << 21, 145 146 146 - PERF_SAMPLE_MAX = 1U << 21, /* non-ABI */ 147 + PERF_SAMPLE_MAX = 1U << 22, /* non-ABI */ 147 148 148 149 __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ 149 150 }; ··· 382 381 ksymbol : 1, /* include ksymbol events */ 383 382 bpf_event : 1, /* include bpf events */ 384 383 aux_output : 1, /* generate AUX records instead of events */ 385 - __reserved_1 : 32; 384 + cgroup : 1, /* include cgroup events */ 385 + __reserved_1 : 31; 386 386 387 387 union { 388 388 __u32 wakeup_events; /* wakeup every n events */ ··· 1013 1011 * }; 1014 1012 */ 1015 1013 PERF_RECORD_BPF_EVENT = 18, 1014 + 1015 + /* 1016 + * struct { 1017 + * struct perf_event_header header; 1018 + * u64 id; 1019 + * char path[]; 1020 + * struct sample_id sample_id; 1021 + * }; 1022 + */ 1023 + PERF_RECORD_CGROUP = 19, 1016 1024 1017 1025 PERF_RECORD_MAX, /* non-ABI */ 1018 1026 };