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

Commit 22080870 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: allow to propagate df in bpf_skb_set_tunnel_key 



Added by 9a628224 ("ip_tunnel: Add dont fragment flag."), allow to
feed df flag into tunneling facilities (currently supported on TX by
vxlan, geneve and gre) as a hint from eBPF's bpf_skb_set_tunnel_key()
helper.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 577c50aa

include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ enum bpf_func_id { 


/* BPF_FUNC_skb_set_tunnel_key flags. */

#define BPF_F_ZERO_CSUM_TX		(1ULL << 1)

#define BPF_F_DONT_FRAGMENT		(1ULL << 2)



/* user accessible mirror of in-kernel sk_buff.

 * new fields can only be added to the end of this structure

net/core/filter.c

+5 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,8 @@ static u64 bpf_skb_set_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5) 
	u8 compat[sizeof(struct bpf_tunnel_key)];

	struct ip_tunnel_info *info;



	if (unlikely(flags & ~(BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX)))

	if (unlikely(flags & ~(BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX |

			       BPF_F_DONT_FRAGMENT)))

		return -EINVAL;

	if (unlikely(size != sizeof(struct bpf_tunnel_key))) {

		switch (size) {
@@ -1844,6 +1845,9 @@ static u64 bpf_skb_set_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5) 
	info->mode = IP_TUNNEL_INFO_TX;



	info->key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM;

	if (flags & BPF_F_DONT_FRAGMENT)

		info->key.tun_flags |= TUNNEL_DONT_FRAGMENT;



	info->key.tun_id = cpu_to_be64(from->tunnel_id);

	info->key.tos = from->tunnel_tos;

	info->key.ttl = from->tunnel_ttl;