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.
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -142,8 +142,9 @@ enum perf_event_sample_format { · 141 unmodified lines | |||
| 142 | PERF_SAMPLE_REGS_INTR = 1U << 18, | 142 | PERF_SAMPLE_REGS_INTR = 1U << 18, |
| 143 | PERF_SAMPLE_PHYS_ADDR = 1U << 19, | 143 | PERF_SAMPLE_PHYS_ADDR = 1U << 19, |
| 144 | PERF_SAMPLE_AUX = 1U << 20, | 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 | __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ | 149 | __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ |
| 149 | }; | 150 | }; |
| @@ -381,7 +382,8 @@ struct perf_event_attr { · 231 unmodified lines | |||
| 381 | ksymbol : 1, /* include ksymbol events */ | 382 | ksymbol : 1, /* include ksymbol events */ |
| 382 | bpf_event : 1, /* include bpf events */ | 383 | bpf_event : 1, /* include bpf events */ |
| 383 | aux_output : 1, /* generate AUX records instead of events */ | 384 | aux_output : 1, /* generate AUX records instead of events */ |
| 384 | __reserved_1 : 32; | 385 | cgroup : 1, /* include cgroup events */ |
| 386 | __reserved_1 : 31; | ||
| 385 | 387 | ||
| 386 | union { | 388 | union { |
| 387 | __u32 wakeup_events; /* wakeup every n events */ | 389 | __u32 wakeup_events; /* wakeup every n events */ |
| @@ -1012,6 +1014,16 @@ enum perf_event_type { · 624 unmodified lines | |||
| 1012 | */ | 1014 | */ |
| 1013 | PERF_RECORD_BPF_EVENT = 18, | 1015 | PERF_RECORD_BPF_EVENT = 18, |
| 1014 | 1016 | ||
| 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 | |||
| 1015 | PERF_RECORD_MAX, /* non-ABI */ | 1027 | PERF_RECORD_MAX, /* non-ABI */ |
| 1016 | }; | 1028 | }; |
| 1017 | 1029 | ||