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

Commit 3fb48d88 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-fib-mtu-check' 



David Ahern says:

====================
Packets that exceed the egress MTU can not be forwarded in the fast path.
Add IPv4 and IPv6 MTU helpers that take a FIB lookup result (versus the
typical dst path) and add the calls to bpf_ipv{4,6}_fib_lookup.

v2
- add ip6_mtu_from_fib6 to ipv6_stub
- only call the new MTU helpers for fib lookups in XDP path; skb
  path uses is_skb_forwardable to determine if the packet can be
  sent via the egress device from the FIB lookup
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents fd0bfa8d 4f74fede

include/net/addrconf.h

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ struct ipv6_stub { 
						   struct flowi6 *fl6, int oif,

						   const struct sk_buff *skb,

						   int strict);

	u32 (*ip6_mtu_from_fib6)(struct fib6_info *f6i, struct in6_addr *daddr,

				 struct in6_addr *saddr);



	void (*udpv6_encap_enable)(void);

	void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr,

include/net/ip6_fib.h

+6 −0
Original line number Diff line number Diff line
@@ -412,6 +412,12 @@ static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i) 
	return f6i->fib6_nh.nh_dev;

}



static inline

struct lwtunnel_state *fib6_info_nh_lwt(const struct fib6_info *f6i)

{

	return f6i->fib6_nh.nh_lwtstate;

}



void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,

		     unsigned int flags);

include/net/ip6_route.h

+3 −0
Original line number Diff line number Diff line
@@ -300,6 +300,9 @@ static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst) 
	return mtu;

}



u32 ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,

		      struct in6_addr *saddr);



struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw,

				   struct net_device *dev, struct sk_buff *skb,

				   const void *daddr);

include/net/ip_fib.h

+2 −0
Original line number Diff line number Diff line
@@ -449,4 +449,6 @@ static inline void fib_proc_exit(struct net *net) 
}

#endif



u32 ip_mtu_from_fib_result(struct fib_result *res, __be32 daddr);



#endif  /* _NET_FIB_H */

net/core/filter.c

+35 −7
Original line number Diff line number Diff line
@@ -4089,7 +4089,7 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, 


#if IS_ENABLED(CONFIG_INET)

static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,

			       u32 flags)

			       u32 flags, bool check_mtu)

{

	struct in_device *in_dev;

	struct neighbour *neigh;
@@ -4098,6 +4098,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 
	struct fib_nh *nh;

	struct flowi4 fl4;

	int err;

	u32 mtu;



	dev = dev_get_by_index_rcu(net, params->ifindex);

	if (unlikely(!dev))
@@ -4149,6 +4150,12 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 
	if (res.fi->fib_nhs > 1)

		fib_select_path(net, &res, &fl4, NULL);



	if (check_mtu) {

		mtu = ip_mtu_from_fib_result(&res, params->ipv4_dst);

		if (params->tot_len > mtu)

			return 0;

	}



	nh = &res.fi->fib_nh[res.nh_sel];



	/* do not handle lwt encaps right now */
@@ -4177,7 +4184,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 


#if IS_ENABLED(CONFIG_IPV6)

static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,

			       u32 flags)

			       u32 flags, bool check_mtu)

{

	struct in6_addr *src = (struct in6_addr *) params->ipv6_src;

	struct in6_addr *dst = (struct in6_addr *) params->ipv6_dst;
@@ -4188,6 +4195,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 
	struct flowi6 fl6;

	int strict = 0;

	int oif;

	u32 mtu;



	/* link local addresses are never forwarded */

	if (rt6_need_strict(dst) || rt6_need_strict(src))
@@ -4250,6 +4258,12 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, 
						       fl6.flowi6_oif, NULL,

						       strict);



	if (check_mtu) {

		mtu = ipv6_stub->ip6_mtu_from_fib6(f6i, dst, src);

		if (params->tot_len > mtu)

			return 0;

	}



	if (f6i->fib6_nh.nh_lwtstate)

		return 0;
@@ -4282,12 +4296,12 @@ BPF_CALL_4(bpf_xdp_fib_lookup, struct xdp_buff *, ctx, 
#if IS_ENABLED(CONFIG_INET)

	case AF_INET:

		return bpf_ipv4_fib_lookup(dev_net(ctx->rxq->dev), params,

					   flags);

					   flags, true);

#endif

#if IS_ENABLED(CONFIG_IPV6)

	case AF_INET6:

		return bpf_ipv6_fib_lookup(dev_net(ctx->rxq->dev), params,

					   flags);

					   flags, true);

#endif

	}

	return 0;
@@ -4306,20 +4320,34 @@ static const struct bpf_func_proto bpf_xdp_fib_lookup_proto = { 
BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb,

	   struct bpf_fib_lookup *, params, int, plen, u32, flags)

{

	struct net *net = dev_net(skb->dev);

	int index = 0;



	if (plen < sizeof(*params))

		return -EINVAL;



	switch (params->family) {

#if IS_ENABLED(CONFIG_INET)

	case AF_INET:

		return bpf_ipv4_fib_lookup(dev_net(skb->dev), params, flags);

		index = bpf_ipv4_fib_lookup(net, params, flags, false);

		break;

#endif

#if IS_ENABLED(CONFIG_IPV6)

	case AF_INET6:

		return bpf_ipv6_fib_lookup(dev_net(skb->dev), params, flags);

		index = bpf_ipv6_fib_lookup(net, params, flags, false);

		break;

#endif

	}

	return -ENOTSUPP;



	if (index > 0) {

		struct net_device *dev;



		dev = dev_get_by_index_rcu(net, index);

		if (!is_skb_forwardable(dev, skb))

			index = 0;

	}



	return index;

}



static const struct bpf_func_proto bpf_skb_fib_lookup_proto = {