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

Commit 9b8ca379 authored by Quentin Monnet's avatar Quentin Monnet Committed by Daniel Borkmann
Browse files

tools: bpf: synchronise BPF UAPI header with tools 



Update with latest changes from include/uapi/linux/bpf.h header.

Signed-off-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 2bae79d2

tools/include/uapi/linux/bpf.h

+24 −8
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ union bpf_attr { 
 * 		A non-negative value equal to or less than *size* on success,

 * 		or a negative error in case of failure.

 *

 * int skb_load_bytes_relative(const struct sk_buff *skb, u32 offset, void *to, u32 len, u32 start_header)

 * int bpf_skb_load_bytes_relative(const struct sk_buff *skb, u32 offset, void *to, u32 len, u32 start_header)

 * 	Description

 * 		This helper is similar to **bpf_skb_load_bytes**\ () in that

 * 		it provides an easy way to load *len* bytes from *offset*
@@ -1857,7 +1857,8 @@ union bpf_attr { 
 *		is resolved), the nexthop address is returned in ipv4_dst

 *		or ipv6_dst based on family, smac is set to mac address of

 *		egress device, dmac is set to nexthop mac address, rt_metric

 *		is set to metric from route (IPv4/IPv6 only).

 *		is set to metric from route (IPv4/IPv6 only), and ifindex

 *		is set to the device index of the nexthop from the FIB lookup.

 *

 *             *plen* argument is the size of the passed in struct.

 *             *flags* argument can be a combination of one or more of the
@@ -1873,9 +1874,10 @@ union bpf_attr { 
 *             *ctx* is either **struct xdp_md** for XDP programs or

 *             **struct sk_buff** tc cls_act programs.

 *     Return

 *             Egress device index on success, 0 if packet needs to continue

 *             up the stack for further processing or a negative error in case

 *             of failure.

 *		* < 0 if any input argument is invalid

 *		*   0 on success (packet is forwarded, nexthop neighbor exists)

 *		* > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the

 *		  packet is not forwarded or needs assist from full stack

 *

 * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags)

 *	Description
@@ -2031,7 +2033,6 @@ union bpf_attr { 
 *		This helper is only available is the kernel was compiled with

 *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to

 *		"**y**".

 *

 *	Return

 *		0

 *
@@ -2051,7 +2052,6 @@ union bpf_attr { 
 *		This helper is only available is the kernel was compiled with

 *		the **CONFIG_BPF_LIRC_MODE2** configuration option set to

 *		"**y**".

 *

 *	Return

 *		0

 *
@@ -2612,6 +2612,18 @@ struct bpf_raw_tracepoint_args { 
#define BPF_FIB_LOOKUP_DIRECT  BIT(0)

#define BPF_FIB_LOOKUP_OUTPUT  BIT(1)



enum {

	BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */

	BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */

	BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */

	BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */

	BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */

	BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */

	BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */

	BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */

	BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */

};



struct bpf_fib_lookup {

	/* input:  network family for lookup (AF_INET, AF_INET6)

	 * output: network family of egress nexthop
@@ -2625,7 +2637,11 @@ struct bpf_fib_lookup { 


	/* total length of packet from network header - used for MTU check */

	__u16	tot_len;

	__u32	ifindex;  /* L3 device index for lookup */



	/* input: L3 device index for lookup

	 * output: device index from FIB lookup

	 */

	__u32	ifindex;



	union {

		/* inputs to lookup */