Commit 608114e4 authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Daniel Borkmann
Browse files

tools: sync linux/bpf.h



Synchronize changes to linux/bpf.h from
* "bpf: allow zero-initializing hash map seed"
* "bpf: move BPF_F_QUERY_EFFECTIVE after map flags"

Signed-off-by: default avatarLorenz Bauer <lmb@cloudflare.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 2f183360
Loading
Loading
Loading
Loading
+10 −3
Original line number Original line Diff line number Diff line
@@ -257,9 +257,6 @@ enum bpf_attach_type {
/* Specify numa node during map creation */
/* Specify numa node during map creation */
#define BPF_F_NUMA_NODE		(1U << 2)
#define BPF_F_NUMA_NODE		(1U << 2)


/* flags for BPF_PROG_QUERY */
#define BPF_F_QUERY_EFFECTIVE	(1U << 0)

#define BPF_OBJ_NAME_LEN 16U
#define BPF_OBJ_NAME_LEN 16U


/* Flags for accessing BPF object */
/* Flags for accessing BPF object */
@@ -269,6 +266,12 @@ enum bpf_attach_type {
/* Flag for stack_map, store build_id+offset instead of pointer */
/* Flag for stack_map, store build_id+offset instead of pointer */
#define BPF_F_STACK_BUILD_ID	(1U << 5)
#define BPF_F_STACK_BUILD_ID	(1U << 5)


/* Zero-initialize hash function seed. This should only be used for testing. */
#define BPF_F_ZERO_SEED		(1U << 6)

/* flags for BPF_PROG_QUERY */
#define BPF_F_QUERY_EFFECTIVE	(1U << 0)

enum bpf_stack_build_id_status {
enum bpf_stack_build_id_status {
	/* user space need an empty entry to identify end of a trace */
	/* user space need an empty entry to identify end of a trace */
	BPF_STACK_BUILD_ID_EMPTY = 0,
	BPF_STACK_BUILD_ID_EMPTY = 0,
@@ -2201,6 +2204,8 @@ union bpf_attr {
 *		**CONFIG_NET** configuration option.
 *		**CONFIG_NET** configuration option.
 *	Return
 *	Return
 *		Pointer to *struct bpf_sock*, or NULL in case of failure.
 *		Pointer to *struct bpf_sock*, or NULL in case of failure.
 *		For sockets with reuseport option, *struct bpf_sock*
 *		return is from reuse->socks[] using hash of the packet.
 *
 *
 * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags)
 * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags)
 *	Description
 *	Description
@@ -2233,6 +2238,8 @@ union bpf_attr {
 *		**CONFIG_NET** configuration option.
 *		**CONFIG_NET** configuration option.
 *	Return
 *	Return
 *		Pointer to *struct bpf_sock*, or NULL in case of failure.
 *		Pointer to *struct bpf_sock*, or NULL in case of failure.
 *		For sockets with reuseport option, *struct bpf_sock*
 *		return is from reuse->socks[] using hash of the packet.
 *
 *
 * int bpf_sk_release(struct bpf_sock *sk)
 * int bpf_sk_release(struct bpf_sock *sk)
 *	Description
 *	Description