Message ID | 20190227160806.195218-1-willemdebruijn.kernel@gmail.com |
---|---|
State | Accepted |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf-next] bpf: add missing entries to bpf_helpers.h | expand |
On Wed, Feb 27, 2019 at 8:09 AM Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > > From: Willem de Bruijn <willemb@google.com> > > This header defines the BPF functions enumerated in uapi/linux.bpf.h > in a callable format. Expand to include all registered functions. > > Signed-off-by: Willem de Bruijn <willemb@google.com> Acked-by: Song Liu <songliubraving@fb.com> > > --- > > changes pre->v1: > - add brief commit message > (not copying Acks as they do not necessarily agree with that) > > - change return type from ull to uint for > bpf_get_cgroup_classid, bpf_get_route_realm, bpf_get_hash_recalc > > - change size arg from int to __u32 for bpf_probe_read_str > > --- > tools/testing/selftests/bpf/bpf_helpers.h | 30 +++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h > index d9999f1ed1d2a..026bea831e039 100644 > --- a/tools/testing/selftests/bpf/bpf_helpers.h > +++ b/tools/testing/selftests/bpf/bpf_helpers.h > @@ -232,6 +232,36 @@ static int (*bpf_skb_change_head)(void *, int len, int flags) = > (void *) BPF_FUNC_skb_change_head; > static int (*bpf_skb_pull_data)(void *, int len) = > (void *) BPF_FUNC_skb_pull_data; > +static unsigned int (*bpf_get_cgroup_classid)(void *ctx) = > + (void *) BPF_FUNC_get_cgroup_classid; > +static unsigned int (*bpf_get_route_realm)(void *ctx) = > + (void *) BPF_FUNC_get_route_realm; > +static int (*bpf_skb_change_proto)(void *ctx, __be16 proto, __u64 flags) = > + (void *) BPF_FUNC_skb_change_proto; > +static int (*bpf_skb_change_type)(void *ctx, __u32 type) = > + (void *) BPF_FUNC_skb_change_type; > +static unsigned int (*bpf_get_hash_recalc)(void *ctx) = > + (void *) BPF_FUNC_get_hash_recalc; > +static unsigned long long (*bpf_get_current_task)(void *ctx) = > + (void *) BPF_FUNC_get_current_task; > +static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) = > + (void *) BPF_FUNC_skb_change_tail; > +static long long (*bpf_csum_update)(void *ctx, __u32 csum) = > + (void *) BPF_FUNC_csum_update; > +static void (*bpf_set_hash_invalid)(void *ctx) = > + (void *) BPF_FUNC_set_hash_invalid; > +static int (*bpf_get_numa_node_id)(void) = > + (void *) BPF_FUNC_get_numa_node_id; > +static int (*bpf_probe_read_str)(void *ctx, __u32 size, > + const void *unsafe_ptr) = > + (void *) BPF_FUNC_probe_read_str; > +static unsigned int (*bpf_get_socket_uid)(void *ctx) = > + (void *) BPF_FUNC_get_socket_uid; > +static unsigned int (*bpf_set_hash)(void *ctx, __u32 hash) = > + (void *) BPF_FUNC_set_hash; > +static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, > + unsigned long long flags) = > + (void *) BPF_FUNC_skb_adjust_room; > > /* Scan the ARCH passed in from ARCH env variable (see Makefile) */ > #if defined(__TARGET_ARCH_x86) > -- > 2.21.0.rc2.261.ga7da99ff1b-goog >
On 02/27/2019 05:08 PM, Willem de Bruijn wrote: > From: Willem de Bruijn <willemb@google.com> > > This header defines the BPF functions enumerated in uapi/linux.bpf.h > in a callable format. Expand to include all registered functions. > > Signed-off-by: Willem de Bruijn <willemb@google.com> Applied, thanks!
diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index d9999f1ed1d2a..026bea831e039 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -232,6 +232,36 @@ static int (*bpf_skb_change_head)(void *, int len, int flags) = (void *) BPF_FUNC_skb_change_head; static int (*bpf_skb_pull_data)(void *, int len) = (void *) BPF_FUNC_skb_pull_data; +static unsigned int (*bpf_get_cgroup_classid)(void *ctx) = + (void *) BPF_FUNC_get_cgroup_classid; +static unsigned int (*bpf_get_route_realm)(void *ctx) = + (void *) BPF_FUNC_get_route_realm; +static int (*bpf_skb_change_proto)(void *ctx, __be16 proto, __u64 flags) = + (void *) BPF_FUNC_skb_change_proto; +static int (*bpf_skb_change_type)(void *ctx, __u32 type) = + (void *) BPF_FUNC_skb_change_type; +static unsigned int (*bpf_get_hash_recalc)(void *ctx) = + (void *) BPF_FUNC_get_hash_recalc; +static unsigned long long (*bpf_get_current_task)(void *ctx) = + (void *) BPF_FUNC_get_current_task; +static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) = + (void *) BPF_FUNC_skb_change_tail; +static long long (*bpf_csum_update)(void *ctx, __u32 csum) = + (void *) BPF_FUNC_csum_update; +static void (*bpf_set_hash_invalid)(void *ctx) = + (void *) BPF_FUNC_set_hash_invalid; +static int (*bpf_get_numa_node_id)(void) = + (void *) BPF_FUNC_get_numa_node_id; +static int (*bpf_probe_read_str)(void *ctx, __u32 size, + const void *unsafe_ptr) = + (void *) BPF_FUNC_probe_read_str; +static unsigned int (*bpf_get_socket_uid)(void *ctx) = + (void *) BPF_FUNC_get_socket_uid; +static unsigned int (*bpf_set_hash)(void *ctx, __u32 hash) = + (void *) BPF_FUNC_set_hash; +static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, + unsigned long long flags) = + (void *) BPF_FUNC_skb_adjust_room; /* Scan the ARCH passed in from ARCH env variable (see Makefile) */ #if defined(__TARGET_ARCH_x86)