On Wed, Aug 28, 2019 at 04:31:22PM +0900, Namhyung Kim wrote: > To support cgroup tracking, add CGROUP event to save a link between > cgroup path and inode number. The attr.cgroup bit was also added to > enable cgroup tracking from userspace. > > This event will be generated when a new cgroup becomes active. > Userspace might need to synthesize those events for existing cgroups. > > As aux_output change is also going on, I just added the bit here as > well to remove possible conflicts later. > > Cc: Tejun Heo <[email protected]> > Cc: Li Zefan <[email protected]> > Cc: Johannes Weiner <[email protected]> > Cc: Adrian Hunter <[email protected]> > Signed-off-by: Namhyung Kim <[email protected]> > --- > include/uapi/linux/perf_event.h | 15 ++++- > kernel/events/core.c | 112 ++++++++++++++++++++++++++++++++ > 2 files changed, 126 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h > index 7198ddd0c6b1..cb07c24b715f 100644 > --- a/include/uapi/linux/perf_event.h > +++ b/include/uapi/linux/perf_event.h > @@ -374,7 +374,9 @@ struct perf_event_attr { > namespaces : 1, /* include namespaces data > */ > ksymbol : 1, /* include ksymbol events > */ > bpf_event : 1, /* include bpf events */ > - __reserved_1 : 33; > + aux_output : 1, /* generate AUX records > instead of events */ > + cgroup : 1, /* include cgroup events */ > + __reserved_1 : 31;
That looks like a rebase fail, aux_output is not from these patches.
