On Tue, Feb 06, 2018 at 03:52:59AM -0800, tip-bot for Song Liu wrote: > Commit-ID: 0d8dd67be013727ae57645ecd3ea2c36365d7da8 > Gitweb: > https://git.kernel.org/tip/0d8dd67be013727ae57645ecd3ea2c36365d7da8 > Author: Song Liu <[email protected]> > AuthorDate: Wed, 6 Dec 2017 14:45:14 -0800 > Committer: Ingo Molnar <[email protected]> > CommitDate: Tue, 6 Feb 2018 10:18:05 +0100
any chance these patches can still make into this release considering they were ready back in December ? We have few followups for them and if we don't get them via Linus's tree into net-next/bpf-next we cannot really proceed further. The other option would be to cherry-pick them into bpf-next/net-next, but also a bit scary due to potential conflicts? Thanks! > perf/headers: Sync new perf_event.h with the tools/include/uapi version > > perf_event.h is updated in previous patch, this patch applies the same > changes to the tools/ version. This is part is put in a separate > patch in case the two files are back ported separately. > > Signed-off-by: Song Liu <[email protected]> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]> > Reviewed-by: Yonghong Song <[email protected]> > Reviewed-by: Josef Bacik <[email protected]> > Acked-by: Alexei Starovoitov <[email protected]> > Cc: <[email protected]> > Cc: <[email protected]> > Cc: <[email protected]> > Cc: <[email protected]> > Cc: Arnaldo Carvalho de Melo <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Namhyung Kim <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Link: http://lkml.kernel.org/r/[email protected] > Signed-off-by: Ingo Molnar <[email protected]> > --- > tools/include/uapi/linux/perf_event.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tools/include/uapi/linux/perf_event.h > b/tools/include/uapi/linux/perf_event.h > index c77c9a2..5d49cfc 100644 > --- a/tools/include/uapi/linux/perf_event.h > +++ b/tools/include/uapi/linux/perf_event.h > @@ -380,10 +380,14 @@ struct perf_event_attr { > __u32 bp_type; > union { > __u64 bp_addr; > + __u64 kprobe_func; /* for perf_kprobe */ > + __u64 uprobe_path; /* for perf_uprobe */ > __u64 config1; /* extension of config */ > }; > union { > __u64 bp_len; > + __u64 kprobe_addr; /* when kprobe_func == NULL */ > + __u64 probe_offset; /* for perf_[k,u]probe */ > __u64 config2; /* extension of config1 */ > }; > __u64 branch_sample_type; /* enum perf_branch_sample_type */
