Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f965e3f authored by Petar Penkov's avatar Petar Penkov Committed by Alexei Starovoitov
Browse files

bpf: sync bpf.h uapi with tools/ 



This patch syncs tools/include/uapi/linux/bpf.h with the flow dissector
definitions from include/uapi/linux/bpf.h

Signed-off-by: default avatarPetar Penkov <ppenkov@google.com>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent d58e468b

tools/include/uapi/linux/bpf.h

+26 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum bpf_prog_type { 
	BPF_PROG_TYPE_LWT_SEG6LOCAL,

	BPF_PROG_TYPE_LIRC_MODE2,

	BPF_PROG_TYPE_SK_REUSEPORT,

	BPF_PROG_TYPE_FLOW_DISSECTOR,

};



enum bpf_attach_type {
@@ -172,6 +173,7 @@ enum bpf_attach_type { 
	BPF_CGROUP_UDP4_SENDMSG,

	BPF_CGROUP_UDP6_SENDMSG,

	BPF_LIRC_MODE2,

	BPF_FLOW_DISSECTOR,

	__MAX_BPF_ATTACH_TYPE

};
@@ -2333,6 +2335,7 @@ struct __sk_buff { 
	/* ... here. */



	__u32 data_meta;

	struct bpf_flow_keys *flow_keys;

};



struct bpf_tunnel_key {
@@ -2778,4 +2781,27 @@ enum bpf_task_fd_type { 
	BPF_FD_TYPE_URETPROBE,		/* filename + offset */

};



struct bpf_flow_keys {

	__u16	nhoff;

	__u16	thoff;

	__u16	addr_proto;			/* ETH_P_* of valid addrs */

	__u8	is_frag;

	__u8	is_first_frag;

	__u8	is_encap;

	__u8	ip_proto;

	__be16	n_proto;

	__be16	sport;

	__be16	dport;

	union {

		struct {

			__be32	ipv4_src;

			__be32	ipv4_dst;

		};

		struct {

			__u32	ipv6_src[4];	/* in6_addr; network order */

			__u32	ipv6_dst[4];	/* in6_addr; network order */

		};

	};

};



#endif /* _UAPI__LINUX_BPF_H__ */