On Wed, Apr 26, 2023 at 12:14:18PM -0700, Andrii Nakryiko wrote:
> On Mon, Apr 24, 2023 at 9:05 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
> >
> > Updating uapi bpf.h tools header with new uprobe_multi
> > link interface.
> >
> > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> > ---
>
> let's merge this with the original UAPI header update patch? We used
> to split this out for libbpf sync purposes, but it is handled easily
> with current sync script, so no need to make this a separate patch
> (but up to you, I don't mind either)
ok, will merge it
thanks,
jirka
>
> > tools/include/uapi/linux/bpf.h | 15 +++++++++++++++
> > 1 file changed, 15 insertions(+)
> >
> > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> > index 1bb11a6ee667..77ce2159478d 100644
> > --- a/tools/include/uapi/linux/bpf.h
> > +++ b/tools/include/uapi/linux/bpf.h
> > @@ -1035,6 +1035,7 @@ enum bpf_attach_type {
> > BPF_TRACE_KPROBE_MULTI,
> > BPF_LSM_CGROUP,
> > BPF_STRUCT_OPS,
> > + BPF_TRACE_UPROBE_MULTI,
> > __MAX_BPF_ATTACH_TYPE
> > };
> >
> > @@ -1052,6 +1053,7 @@ enum bpf_link_type {
> > BPF_LINK_TYPE_KPROBE_MULTI = 8,
> > BPF_LINK_TYPE_STRUCT_OPS = 9,
> > BPF_LINK_TYPE_NETFILTER = 10,
> > + BPF_LINK_TYPE_UPROBE_MULTI = 11,
> >
> > MAX_BPF_LINK_TYPE,
> > };
> > @@ -1169,6 +1171,11 @@ enum bpf_link_type {
> > */
> > #define BPF_F_KPROBE_MULTI_RETURN (1U << 0)
> >
> > +/* link_create.uprobe_multi.flags used in LINK_CREATE command for
> > + * BPF_TRACE_UPROBE_MULTI attach type to create return probe.
> > + */
> > +#define BPF_F_UPROBE_MULTI_RETURN (1U << 0)
> > +
> > /* When BPF ldimm64's insn[0].src_reg != 0 then this can have
> > * the following extensions:
> > *
> > @@ -1568,6 +1575,14 @@ union bpf_attr {
> > __s32 priority;
> > __u32 flags;
> > } netfilter;
> > + struct {
> > + __u32 flags;
> > + __u32 cnt;
> > + __aligned_u64 paths;
> > + __aligned_u64 offsets;
> > + __aligned_u64 ref_ctr_offsets;
> > + __aligned_u64 cookies;
> > + } uprobe_multi;
> > };
> > } link_create;
> >
> > --
> > 2.40.0
> >
