All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h
@ 2019-02-27 16:08 Willem de Bruijn
  2019-02-27 18:28 ` Song Liu
  2019-02-28 23:58 ` Daniel Borkmann
  0 siblings, 2 replies; 3+ messages in thread
From: Willem de Bruijn @ 2019-02-27 16:08 UTC (permalink / raw)
  To: netdev; +Cc: ast, daniel, kafai, sdf, Willem de Bruijn

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>

---

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h
  2019-02-27 16:08 [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h Willem de Bruijn
@ 2019-02-27 18:28 ` Song Liu
  2019-02-28 23:58 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Song Liu @ 2019-02-27 18:28 UTC (permalink / raw)
  To: Willem de Bruijn
  Cc: Networking, Alexei Starovoitov, Daniel Borkmann,
	Martin KaFai Lau, Stanislav Fomichev, Willem de Bruijn

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
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h
  2019-02-27 16:08 [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h Willem de Bruijn
  2019-02-27 18:28 ` Song Liu
@ 2019-02-28 23:58 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2019-02-28 23:58 UTC (permalink / raw)
  To: Willem de Bruijn, netdev; +Cc: ast, kafai, sdf, Willem de Bruijn

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!

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-28 23:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-27 16:08 [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h Willem de Bruijn
2019-02-27 18:28 ` Song Liu
2019-02-28 23:58 ` Daniel Borkmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.