| Message ID | 1554132731-3095-3-git-send-email-alan.maguire@oracle.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | L2 encap support for bpf_skb_adjust_room | expand |
On Mon, Apr 1, 2019 at 11:33 AM Alan Maguire <alan.maguire@oracle.com> wrote: > > In > > commit 868d523535c2 ("bpf: add bpf_skb_adjust_room encap flags") > > ...Willem introduced support to bpf_skb_adjust_room for GSO-friendly > GRE and UDP encapsulation. > > For GSO to work for skbs, the inner headers (mac and network) need to > be marked. For L3 encapsulation using bpf_skb_adjust_room, the mac > and network headers are identical. Here we provide a way of specifying > the inner mac header length for cases where L2 encap is desired. Such > an approach can support encapsulated ethernet headers, MPLS headers etc. > For example to convert from a packet of form [eth][ip][tcp] to > [eth][ip][udp][inner mac][ip][tcp], something like the following could > be done: > > headroom = sizeof(iph) + sizeof(struct udphdr) + inner_maclen; > > ret = bpf_skb_adjust_room(skb, headroom, BPF_ADJ_ROOM_MAC, > BPF_F_ADJ_ROOM_ENCAP_L4_UDP | > BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 | > BPF_F_ADJ_ROOM_ENCAP_L2(inner_maclen)); > > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> > --- > +#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & 0xff) << 56) Here .. > > /* Mode for BPF_FUNC_skb_adjust_room helper. */ > enum bpf_adj_room_mode { > diff --git a/net/core/filter.c b/net/core/filter.c > index 22eb2ed..02ae8c0 100644 > --- a/net/core/filter.c > +++ b/net/core/filter.c > @@ -2969,14 +2969,16 @@ static u32 bpf_skb_net_base_len(const struct sk_buff *skb) > #define BPF_F_ADJ_ROOM_MASK (BPF_F_ADJ_ROOM_FIXED_GSO | \ > BPF_F_ADJ_ROOM_ENCAP_L3_MASK | \ > BPF_F_ADJ_ROOM_ENCAP_L4_GRE | \ > - BPF_F_ADJ_ROOM_ENCAP_L4_UDP) > + BPF_F_ADJ_ROOM_ENCAP_L4_UDP | \ > + BPF_F_ADJ_ROOM_ENCAP_L2(0xff)) .. and here .. > > static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, > u64 flags) > { > + u16 mac_len = 0, inner_mac = 0, inner_net = 0, inner_trans = 0; > bool encap = flags & BPF_F_ADJ_ROOM_ENCAP_L3_MASK; > - u16 mac_len = 0, inner_net = 0, inner_trans = 0; > unsigned int gso_type = SKB_GSO_DODGY; > + u8 inner_mac_len = flags >> 56; .. and here: please do not use hardcoded constants. Define explicit constant integers or macros for readability and consistency. > int ret; > > if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) { > @@ -3003,11 +3005,19 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, > flags & BPF_F_ADJ_ROOM_ENCAP_L4_UDP) > return -EINVAL; > > + if (flags & BPF_F_ADJ_ROOM_ENCAP_L4_UDP && > + flags & BPF_F_ADJ_ROOM_FIXED_GSO && > + inner_mac_len > 0) > + return -EINVAL; > + Why is UDP encap with inner MAC (or MPLS) not allowed with fixed GSO?
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 8370245..6d8346a 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1500,6 +1500,10 @@ struct bpf_stack_build_id { * * **BPF_F_ADJ_ROOM_ENCAP_L4_UDP **: * Use with ENCAP_L3 flags to further specify the tunnel type. * + * * **BPF_F_ADJ_ROOM_ENCAP_L2(len) **: + * Use with ENCAP_L3/L4 flags to further specify the tunnel + * type; **len** is the length of the inner MAC header. + * * A call to this helper is susceptible to change the underlaying * packet buffer. Therefore, at load time, all checks on pointers * previously done by the verifier are invalidated and must be @@ -2645,6 +2649,7 @@ enum bpf_func_id { #define BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 (1ULL << 2) #define BPF_F_ADJ_ROOM_ENCAP_L4_GRE (1ULL << 3) #define BPF_F_ADJ_ROOM_ENCAP_L4_UDP (1ULL << 4) +#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & 0xff) << 56) /* Mode for BPF_FUNC_skb_adjust_room helper. */ enum bpf_adj_room_mode { diff --git a/net/core/filter.c b/net/core/filter.c index 22eb2ed..02ae8c0 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2969,14 +2969,16 @@ static u32 bpf_skb_net_base_len(const struct sk_buff *skb) #define BPF_F_ADJ_ROOM_MASK (BPF_F_ADJ_ROOM_FIXED_GSO | \ BPF_F_ADJ_ROOM_ENCAP_L3_MASK | \ BPF_F_ADJ_ROOM_ENCAP_L4_GRE | \ - BPF_F_ADJ_ROOM_ENCAP_L4_UDP) + BPF_F_ADJ_ROOM_ENCAP_L4_UDP | \ + BPF_F_ADJ_ROOM_ENCAP_L2(0xff)) static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, u64 flags) { + u16 mac_len = 0, inner_mac = 0, inner_net = 0, inner_trans = 0; bool encap = flags & BPF_F_ADJ_ROOM_ENCAP_L3_MASK; - u16 mac_len = 0, inner_net = 0, inner_trans = 0; unsigned int gso_type = SKB_GSO_DODGY; + u8 inner_mac_len = flags >> 56; int ret; if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) { @@ -3003,11 +3005,19 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, flags & BPF_F_ADJ_ROOM_ENCAP_L4_UDP) return -EINVAL; + if (flags & BPF_F_ADJ_ROOM_ENCAP_L4_UDP && + flags & BPF_F_ADJ_ROOM_FIXED_GSO && + inner_mac_len > 0) + return -EINVAL; + if (skb->encapsulation) return -EALREADY; mac_len = skb->network_header - skb->mac_header; inner_net = skb->network_header; + if (inner_mac_len > len_diff) + return -EINVAL; + inner_mac = inner_net - inner_mac_len; inner_trans = skb->transport_header; } @@ -3016,8 +3026,7 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, return ret; if (encap) { - /* inner mac == inner_net on l3 encap */ - skb->inner_mac_header = inner_net; + skb->inner_mac_header = inner_mac; skb->inner_network_header = inner_net; skb->inner_transport_header = inner_trans; skb_set_inner_protocol(skb, skb->protocol); @@ -3031,7 +3040,7 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, gso_type |= SKB_GSO_GRE; else if (flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV6) gso_type |= SKB_GSO_IPXIP6; - else + else if (flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV4) gso_type |= SKB_GSO_IPXIP4; if (flags & BPF_F_ADJ_ROOM_ENCAP_L4_GRE ||
In commit 868d523535c2 ("bpf: add bpf_skb_adjust_room encap flags") ...Willem introduced support to bpf_skb_adjust_room for GSO-friendly GRE and UDP encapsulation. For GSO to work for skbs, the inner headers (mac and network) need to be marked. For L3 encapsulation using bpf_skb_adjust_room, the mac and network headers are identical. Here we provide a way of specifying the inner mac header length for cases where L2 encap is desired. Such an approach can support encapsulated ethernet headers, MPLS headers etc. For example to convert from a packet of form [eth][ip][tcp] to [eth][ip][udp][inner mac][ip][tcp], something like the following could be done: headroom = sizeof(iph) + sizeof(struct udphdr) + inner_maclen; ret = bpf_skb_adjust_room(skb, headroom, BPF_ADJ_ROOM_MAC, BPF_F_ADJ_ROOM_ENCAP_L4_UDP | BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 | BPF_F_ADJ_ROOM_ENCAP_L2(inner_maclen)); Signed-off-by: Alan Maguire <alan.maguire@oracle.com> --- include/uapi/linux/bpf.h | 5 +++++ net/core/filter.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)