Skip to content

Commit 03590fb

Browse files
namhyungacmel
authored andcommitted
tools headers UAPI: Update tools's copy of linux/perf_event.h
To get the changes in: 6546b19 ("perf/core: Add PERF_SAMPLE_CGROUP feature") 96aaab6 ("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 <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: http://lore.kernel.org/lkml/[email protected] [ split from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 6546b19 commit 03590fb

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

tools/include/uapi/linux/perf_event.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ enum perf_event_sample_format {
142142
PERF_SAMPLE_REGS_INTR = 1U << 18,
143143
PERF_SAMPLE_PHYS_ADDR = 1U << 19,
144144
PERF_SAMPLE_AUX = 1U << 20,
145+
PERF_SAMPLE_CGROUP = 1U << 21,
145146

146-
PERF_SAMPLE_MAX = 1U << 21, /* non-ABI */
147+
PERF_SAMPLE_MAX = 1U << 22, /* non-ABI */
147148

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

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

1017+
/*
1018+
* struct {
1019+
* struct perf_event_header header;
1020+
* u64 id;
1021+
* char path[];
1022+
* struct sample_id sample_id;
1023+
* };
1024+
*/
1025+
PERF_RECORD_CGROUP = 19,
1026+
10151027
PERF_RECORD_MAX, /* non-ABI */
10161028
};
10171029

0 commit comments

Comments
 (0)