bpf: add BPF_LWT_ENCAP_IP option to bpf_lwt_push_encap
Subsystems (7)
v6 cover bpf: add BPF_LWT_ENCAP_IP option to bpf_lwt_push_encap
This patchset implements BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap BPF helper. It enables BPF programs (specifically, BPF_PROG_TYPE_LWT_IN and BPF_PROG_TYPE_LWT_XMIT prog types) to add IP encapsulation headers to packets (e.g. IP/GRE, GUE, IPIP).
This is useful when thousands of different short-lived flows should be encapped, each with different and dynamically determined destination. Although lwtunnels can be used in some of these scenarios, the ability to dynamically generate encap headers adds more flexibility, e.g. when routing depends on the state of the host (reflected in global bpf maps).
V2 changes: Added flowi-based route lookup, IPv6 encapping, and
encapping on ingress.
V3 changes: incorporated David Ahern's suggestions:
- added l3mdev check/oif (patch 2)
- sync bpf.h from include/uapi into tools/include/uapi
- selftest tweaks
V4 changes: moved route lookup/dst change from bpf_push_ip_encap
to when BPF_LWT_REROUTE is handled, as suggested by David Ahern.
V5 changes: added a check in lwt_xmit that skb->protocol stays the
same if the skb is to be passed back to the stack (ret == BPF_OK). Again, suggested by David Ahern.
V6 changes: reject skb_is_gso() packets. A follow-up patch(set) will
process GSO packets more intelligently.
Peter Oskolkov (5):
bpf: add plumbing for BPF_LWT_ENCAP_IP in bpf_lwt_push_encap
bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap
bpf: add handling of BPF_LWT_REROUTE to lwt_bpf.c
bpf: sync <kdir>/<uapi>/bpf.h with tools/<uapi>/bpf.h
selftests: bpf: add test_lwt_ip_encap selftest
include/net/lwtunnel.h | 3 + include/uapi/linux/bpf.h | 23 +- net/core/filter.c | 47 ++- net/core/lwt_bpf.c | 188 +++++++++++ tools/include/uapi/linux/bpf.h | 23 +- tools/testing/selftests/bpf/Makefile | 5 +- .../testing/selftests/bpf/test_lwt_ip_encap.c | 85 +++++ .../selftests/bpf/test_lwt_ip_encap.sh | 311 ++++++++++++++++++ 8 files changed, 674 insertions(+), 11 deletions(-) create mode 100644 tools/testing/selftests/bpf/test_lwt_ip_encap.c create mode 100755 tools/testing/selftests/bpf/test_lwt_ip_encap.sh
Signature · 1 line
2.20.1.611.gfbb209baf1-goog
PATCH v6 1/5 bpf: add plumbing for BPF_LWT_ENCAP_IP in bpf_lwt_push_encap
This patch adds all needed plumbing in preparation to allowing bpf programs to do IP encapping via bpf_lwt_push_encap. Actual implementation is added in the next patch in the patchset.
Of note:
- bpf_lwt_push_encap can now be called from BPF_PROG_TYPE_LWT_XMIT prog types in addition to BPF_PROG_TYPE_LWT_IN;
- as route lookups are different for ingress vs egress, the single external bpf_lwt_push_encap BPF helper is routed internally to either bpf_lwt_in_push_encap or bpf_lwt_xmit_push_encap BPF_CALLs, depending on prog type.
--- include/uapi/linux/bpf.h | 23 ++++++++++++++++++-- net/core/filter.c | 46 +++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 7 deletions(-)
include/uapi/linux/bpf.h +21 -2
@@ -2015,6 +2015,16 @@ union bpf_attr {* Only works if *skb* contains an IPv6 packet. Insert a * Segment Routing Header (**struct ipv6_sr_hdr**) inside * the IPv6 header. +* **BPF_LWT_ENCAP_IP** +* IP encapsulation (GRE/GUE/IPIP/etc). The outer header +* must be IPv4 or IPv6, followed by zero or more +* additional headers, up to LWT_BPF_MAX_HEADROOM total +* bytes in all prepended headers. +* +* BPF_LWT_ENCAP_SEG6*** types can be called by bpf programs of +* type BPF_PROG_TYPE_LWT_IN; BPF_LWT_ENCAP_IP type can be called +* by bpf programs of types BPF_PROG_TYPE_LWT_IN and +* BPF_PROG_TYPE_LWT_XMIT. * * A call to this helper is susceptible to change the underlaying * packet buffer. Therefore, at load time, all checks on pointers
@@ -2495,7 +2505,8 @@ enum bpf_hdr_start_off {/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */ enum bpf_lwt_encap_mode {BPF_LWT_ENCAP_SEG6 , -BPF_LWT_ENCAP_SEG6_INLINE +BPF_LWT_ENCAP_SEG6_INLINE , +BPF_LWT_ENCAP_IP , };#define __bpf_md_ptr (type, name) \
@@ -2583,7 +2594,15 @@ enum bpf_ret_code {BPF_DROP =2 ,/* 3-6 reserved */ BPF_REDIRECT =7 , - /* >127 are reserved for prog type specific return codes */ +/* >127 are reserved for prog type specific return codes. +* +* BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and +* BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been +* changed and should be routed based on its new L3 header. +* (This is an L3 redirect, as opposed to L2 redirect +* represented by BPF_REDIRECT above). +*/ + BPF_LWT_REROUTE = 128, }; struct bpf_sock {
net/core/filter.c +41 -5
82 lines not on this page · raw message
Signature · 1 line
2.20.1.611.gfbb209baf1-goog
PATCH v6 2/5 bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap
In reply to Peter OskolkovThis patch implements BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap BPF helper. It enables BPF programs (specifically, BPF_PROG_TYPE_LWT_IN and BPF_PROG_TYPE_LWT_XMIT prog types) to add IP encapsulation headers to packets (e.g. IP/GRE, GUE, IPIP).
This is useful when thousands of different short-lived flows should be encapped, each with different and dynamically determined destination. Although lwtunnels can be used in some of these scenarios, the ability to dynamically generate encap headers adds more flexibility, e.g. when routing depends on the state of the host (reflected in global bpf maps).
Note: a follow-up patch with deal with GSO-enabled packets, which are currently rejected at encapping attempt.
--- include/net/lwtunnel.h | 3 ++ net/core/filter.c | 3 +- net/core/lwt_bpf.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-)
include/net/lwtunnel.h +3 -0
@@ -126,6 +126,8 @@ int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b);int lwtunnel_output (struct net *net,struct sock *sk,struct sk_buff *skb);int lwtunnel_input (struct sk_buff *skb);int lwtunnel_xmit (struct sk_buff *skb); +int bpf_lwt_push_ip_encap (struct sk_buff *skb,void *hdr,u32 len, +bool ingress);static inline void lwtunnel_set_redirect (struct dst_entry *dst) {
@@ -138,6 +140,7 @@ static inline void lwtunnel_set_redirect(struct dst_entry *dst) dst->input = lwtunnel_input; } } +#else static inline void lwtstate_free (struct lwtunnel_state *lws)
net/core/filter.c +2 -1
@@ -73,6 +73,7 @@#include <linux/seg6_local.h> #include <net/seg6.h> #include <net/seg6_local.h> +#include <net/lwtunnel.h> /** * sk_filter_trim_cap - run a packet through a socket filter
@@ -4804,7 +4805,7 @@ static int bpf_push_seg6_encap(struct sk_buff *skb, u32 type, void *hdr, u32 lenstatic int bpf_push_ip_encap (struct sk_buff *skb,void *hdr,u32 len,bool ingress) { -return -EINVAL ;/* Implemented in the next patch. */ +return bpf_lwt_push_ip_encap (skb, hdr, len, ingress); } BPF_CALL_4(bpf_lwt_in_push_encap, struct sk_buff *, skb, u32, type, void *, hdr,
net/core/lwt_bpf.c +63 -0
69 lines not on this page · raw message
Signature · 1 line
2.20.1.611.gfbb209baf1-goog
Re: [PATCH bpf-next v6 2/5] bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap
Quoted 16 lines · Peter Oskolkov
This patch implements
BPF_LWT_ENCAP_IPmode inbpf_lwt_push_encapBPF helper. It enables BPF programs (specifically,BPF_PROG_TYPE_LWT_INandBPF_PROG_TYPE_LWT_XMITprog types) to add IP encapsulation headers to packets (e.g. IP/GRE, GUE, IPIP).This is useful when thousands of different short-lived flows should be encapped, each with different and dynamically determined destination. Although lwtunnels can be used in some of these scenarios, the ability to dynamically generate encap headers adds more flexibility, e.g. when routing depends on the state of the host (reflected in global bpf maps).
Note: a follow-up patch with deal with GSO-enabled packets, which are currently rejected at encapping attempt.
Signed-off-by Peter Oskolkov <[email protected]>
...
net/core/lwt_bpf.c static const struct lwtunnel_encap_ops bpf_encap_ops = { · line 404
Quoted 12 lines
net/core/lwt_bpf.c +12
-0+int bpf_lwt_push_ip_encap (struct sk_buff *skb,void *hdr,u32 len,bool ingress) +{ +struct iphdr *iph; +bool ipv4; +int err; + +if (unlikely (len <sizeof (struct iphdr ) || len >LWT_BPF_MAX_HEADROOM )) +return -EINVAL ; + +/* GSO-enabled packets cannot be encapped at the moment. */ +if (unlikely (skb_is_gso (skb))) +return -EINVAL ;
I don't understand why that's 'unlikely'.
Both tx and rx are very likely to have gso skbs.
Are you saying this feature will require user to disable gro/gso on a device? imo gso has to be supported from the start.
Re: [PATCH bpf-next v6 2/5] bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap
Quoted 28 lines · Alexei Starovoitov
Quoted 16 lines · Peter Oskolkov
This patch implements
BPF_LWT_ENCAP_IPmode inbpf_lwt_push_encapBPF helper. It enables BPF programs (specifically,BPF_PROG_TYPE_LWT_INandBPF_PROG_TYPE_LWT_XMITprog types) to add IP encapsulation headers to packets (e.g. IP/GRE, GUE, IPIP).This is useful when thousands of different short-lived flows should be encapped, each with different and dynamically determined destination. Although lwtunnels can be used in some of these scenarios, the ability to dynamically generate encap headers adds more flexibility, e.g. when routing depends on the state of the host (reflected in global bpf maps).
Note: a follow-up patch with deal with GSO-enabled packets, which are currently rejected at encapping attempt.
Signed-off-by Peter Oskolkov <[email protected]>...
Quoted 9 lines
net/core/lwt_bpf.c +9
-0+int bpf_lwt_push_ip_encap (struct sk_buff *skb,void *hdr,u32 len,bool ingress) +{ +struct iphdr *iph; +bool ipv4; +int err; + +if (unlikely (len <sizeof (struct iphdr ) || len >LWT_BPF_MAX_HEADROOM )) +return -EINVAL ; +
Quoted 8 lines
net/core/lwt_bpf.c static const struct lwtunnel_encap_ops bpf_encap_ops = { · line 404
Quoted 3 lines
net/core/lwt_bpf.c +3
-0+/* GSO-enabled packets cannot be encapped at the moment. */ +if (unlikely (skb_is_gso (skb))) +return -EINVAL ;I don't understand why that's 'unlikely'.
Both tx and rx are very likely to have gso skbs.
Are you saying this feature will require user to disable gro/gso on a device? imo gso has to be supported from the start.
OK, I'll work on v7 with GSO support... :)
Quoted 1 line
PATCH v6 3/5 bpf: add handling of BPF_LWT_REROUTE to lwt_bpf.c
In reply to Peter OskolkovThis patch builds on top of the previous patch in the patchset, which added BPF_LWT_ENCAP_IP mode to bpf_lwt_push_encap. As the encapping can result in the skb needing to go via a different interface/route/dst, bpf programs can indicate this by returning BPF_LWT_REROUTE, which triggers a new route lookup for the skb.
--- net/core/lwt_bpf.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+)
net/core/lwt_bpf.c +125 -0
@@ -16,6 +16,7 @@#include <linux/types.h> #include <linux/bpf.h> #include <net/lwtunnel.h> +#include <net/ip6_route.h> struct bpf_lwt_prog {struct bpf_prog *prog;
@@ -55,6 +56,7 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,switch (ret) {case BPF_OK : +case BPF_LWT_REROUTE :break ;case BPF_REDIRECT :
@@ -87,6 +89,32 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,return ret; } +static int bpf_lwt_input_reroute (struct sk_buff *skb) +{ +int err = -EINVAL ; + +if (skb->protocol ==htons (ETH_P_IP )) { +struct iphdr *iph =ip_hdr (skb); + + err =ip_route_input_noref (skb, iph->daddr, iph->saddr, + iph->tos,skb_dst (skb)->dev); + }else if (skb->protocol ==htons (ETH_P_IPV6 )) { +ip6_route_input (skb); + err =skb_dst (skb)->error; + }else { +pr_warn_once ("BPF_LWT_REROUTE input: unsupported proto %d\n" , + skb->protocol); + } + +if (err) + goto err; +return dst_input (skb); + +err: +kfree_skb (skb); +return err; +} +static int bpf_input (struct sk_buff *skb) {struct dst_entry *dst =skb_dst (skb);
@@ -98,6 +126,8 @@ static int bpf_input(struct sk_buff *skb) ret =run_lwt_bpf (skb, &bpf->in, dst,NO_REDIRECT );if (ret <0 )return ret; +if (ret ==BPF_LWT_REROUTE ) +return bpf_lwt_input_reroute (skb); }if (unlikely (!dst->lwtstate->orig_input)) {
@@ -147,6 +177,90 @@ static int xmit_check_hhlen(struct sk_buff *skb)return 0 ; } +static int bpf_lwt_xmit_reroute (struct sk_buff *skb) +{ +struct net_device *l3mdev =l3mdev_master_dev_rcu (skb_dst (skb)->dev); +int oif = l3mdev ? l3mdev->ifindex :0 ; +struct dst_entry *dst =NULL ; +struct sock *sk; +struct net *net; +bool ipv4; +int err; + +if (skb->protocol ==htons (ETH_P_IP )) { + ipv4 = true; + }else if (skb->protocol ==htons (ETH_P_IPV6 )) { + ipv4 = false; + }else { +pr_warn_once ("BPF_LWT_REROUTE xmit: unsupported proto %d\n" , + skb->protocol); +return -EINVAL ; + } + + sk =sk_to_full_sk (skb->sk); +if (sk) { +if (sk->sk_bound_dev_if) + oif = sk->sk_bound_dev_if; + net =sock_net (sk); + }else { + net =dev_net (skb_dst (skb)->dev); + } + +if (ipv4) { +struct iphdr *iph =ip_hdr (skb); +struct flowi4 fl4 = {0 }; +struct rtable *rt; + + fl4.flowi4_oif = oif; + fl4.flowi4_mark = skb->mark; + fl4.flowi4_uid =sock_net_uid (net, sk); + fl4.flowi4_tos =RT_TOS (iph->tos); + fl4.flowi4_flags =FLOWI_FLAG_ANYSRC ; + fl4.flowi4_proto = iph->protocol; + fl4.daddr = iph->daddr; + fl4.saddr = iph->saddr; + + rt =ip_route_output_key (net, &fl4); +if (IS_ERR (rt) || rt->dst.error) +return -EINVAL ; + dst = &rt->dst; + }else { +struct ipv6hdr *iph6 =ipv6_hdr (skb); +struct flowi6 fl6 = {0 }; + + fl6.flowi6_oif = oif; + fl6.flowi6_mark = skb->mark; + fl6.flowi6_uid =sock_net_uid (net, sk); + fl6.flowlabel =ip6_flowinfo (iph6); + fl6.flowi6_proto = iph6->nexthdr; + fl6.daddr = iph6->daddr; + fl6.saddr = iph6->saddr; + + dst =ip6_route_output (net, skb->sk, &fl6); +if (IS_ERR (dst) || dst->error) +return -EINVAL ; + } + +/* Although skb header was reserved in bpf_lwt_push_ip_encap(), it +* was done for the previous dst, so we are doing it here again, in +* case the new dst needs much more space. The call below is a noop +* if there is enough header space in skb. +*/ + err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev)); +if (unlikely (err)) +return err; + +skb_dst_drop (skb); +skb_dst_set (skb, dst); + + err =dst_output (dev_net (skb_dst (skb)->dev), skb->sk, skb); +if (unlikely (err)) +return err; + +/* ip[6]_finish_output2 understand LWTUNNEL_XMIT_DONE */ +return LWTUNNEL_XMIT_DONE ; +} +static int bpf_xmit (struct sk_buff *skb) {struct dst_entry *dst =skb_dst (skb);
@@ -154,11 +268,20 @@ static int bpf_xmit(struct sk_buff *skb) bpf =bpf_lwt_lwtunnel (dst->lwtstate);if (bpf->xmit.prog) { +__be16 proto = skb->protocol;int ret; ret =run_lwt_bpf (skb, &bpf->xmit, dst,CAN_REDIRECT );switch (ret) {case BPF_OK : +/* If the header changed, e.g. via bpf_lwt_push_encap, +* BPF_LWT_REROUTE below should have been used if the +* protocol was also changed. +*/ +if (skb->protocol != proto) { +kfree_skb (skb); +return -EINVAL ; + }/* If the header was expanded, headroom might be too * small for L2 header to come, expand as needed. */
@@ -169,6 +292,8 @@ static int bpf_xmit(struct sk_buff *skb)return LWTUNNEL_XMIT_CONTINUE ;case BPF_REDIRECT :return LWTUNNEL_XMIT_DONE ; +case BPF_LWT_REROUTE : +return bpf_lwt_xmit_reroute (skb);default :return ret; }
Signature · 1 line
2.20.1.611.gfbb209baf1-goog
PATCH v6 4/5 bpf: sync <kdir>/<uapi>/bpf.h with tools/<uapi>/bpf.h
In reply to Peter OskolkovThis patch copies changes in bpf.h done by a previous patch in this patchset from the kernel uapi include dir into tools uapi include dir.
--- tools/include/uapi/linux/bpf.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
tools/include/uapi/linux/bpf.h +21 -2
@@ -2015,6 +2015,16 @@ union bpf_attr {* Only works if *skb* contains an IPv6 packet. Insert a * Segment Routing Header (**struct ipv6_sr_hdr**) inside * the IPv6 header. +* **BPF_LWT_ENCAP_IP** +* IP encapsulation (GRE/GUE/IPIP/etc). The outer header +* must be IPv4 or IPv6, followed by zero or more +* additional headers, up to LWT_BPF_MAX_HEADROOM total +* bytes in all prepended headers. +* +* BPF_LWT_ENCAP_SEG6*** types can be called by bpf programs of +* type BPF_PROG_TYPE_LWT_IN; BPF_LWT_ENCAP_IP type can be called +* by bpf programs of types BPF_PROG_TYPE_LWT_IN and +* BPF_PROG_TYPE_LWT_XMIT. * * A call to this helper is susceptible to change the underlaying * packet buffer. Therefore, at load time, all checks on pointers
@@ -2495,7 +2505,8 @@ enum bpf_hdr_start_off {/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */ enum bpf_lwt_encap_mode {BPF_LWT_ENCAP_SEG6 , -BPF_LWT_ENCAP_SEG6_INLINE +BPF_LWT_ENCAP_SEG6_INLINE , +BPF_LWT_ENCAP_IP , };#define __bpf_md_ptr (type, name) \
@@ -2583,7 +2594,15 @@ enum bpf_ret_code {BPF_DROP =2 ,/* 3-6 reserved */ BPF_REDIRECT =7 , - /* >127 are reserved for prog type specific return codes */ +/* >127 are reserved for prog type specific return codes. +* +* BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and +* BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been +* changed and should be routed based on its new L3 header. +* (This is an L3 redirect, as opposed to L2 redirect +* represented by BPF_REDIRECT above). +*/ + BPF_LWT_REROUTE = 128, }; struct bpf_sock {
Signature · 1 line
2.20.1.611.gfbb209baf1-goog
PATCH v6 5/5 selftests: bpf: add test_lwt_ip_encap selftest
In reply to Peter OskolkovThis patch adds a bpf self-test to cover BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap.
Covered:
- encapping in LWT_IN and LWT_XMIT
- IPv4 and IPv6
A follow-up patch will add VRF-enabled tests.
--- tools/testing/selftests/bpf/Makefile | 5 +- .../testing/selftests/bpf/test_lwt_ip_encap.c | 85 +++++ .../selftests/bpf/test_lwt_ip_encap.sh | 311 ++++++++++++++++++ 3 files changed, 399 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/test_lwt_ip_encap.c create mode 100755 tools/testing/selftests/bpf/test_lwt_ip_encap.sh
tools/testing/selftests/bpf/Makefile +3 -2
@@ -35,7 +35,7 @@ BPF_OBJ_FILES = \ sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ test_skb_cgroup_id_kern.o bpf_flow.o netcnt_prog.o test_xdp_vlan.o \ - xdp_dummy.o test_map_in_map.o + xdp_dummy.o test_map_in_map.o test_lwt_ip_encap.o # Objects are built with default compilation flags and with sub-register # code-gen enabled.
@@ -73,7 +73,8 @@ TEST_PROGS := test_kmod.sh \ test_lirc_mode2.sh \ test_skb_cgroup_id.sh \ test_flow_dissector.sh \ - test_xdp_vlan.sh + test_xdp_vlan.sh \ + test_lwt_ip_encap.sh TEST_PROGS_EXTENDED := with_addr.sh \ with_tunnels.sh \
tools/testing/selftests/bpf/test_lwt_ip_encap.c new file +85 -0
85 lines not on this page · raw message
tools/testing/selftests/bpf/test_lwt_ip_encap.sh new file +311 -0
311 lines not on this page · raw message
Signature · 1 line
2.20.1.611.gfbb209baf1-goog