Various BPF helper improvements
Subsystems (9)
Daniel Borkmann
maintainerv3 cover Various BPF helper improvements
This series adds two BPF helpers, that is, one for retrieving the classid of an skb and another one to redirect via the neigh subsystem, and improves also the cookie helpers by removing the atomic counter. I've also added the bpf_tail_call_static() helper to the libbpf API that we've been using in Cilium for a while now, and last but not least the series adds a few selftests. For details, please check individual patches, thanks!
v2 -> v3:
- Removed double skb->dev = dev assignment (David)
- Added headroom check for v6 path (David)
- Set set flowi4_proto for ip_route_output_flow (David)
- Rebased onto latest bpf-next
v1 -> v2:
- Rework cookie generator to support nested contexts (Eric)
- Use ip_neigh_gw6() and container_of() (David)
- Rename __throw_build_bug() and improve comments (Andrii)
- Use bpf_tail_call_static() also in BPF samples (Maciej)
Daniel Borkmann (6):
bpf: add classid helper only based on skb->sk
bpf, net: rework cookie generator as per-cpu one
bpf: add redirect_neigh helper as redirect drop-in bpf, libbpf: add bpf_tail_call_static helper for bpf programs bpf, selftests: use bpf_tail_call_static where appropriate bpf, selftests: add redirect_neigh selftest
include/linux/cookie.h | 51 +++ include/linux/skbuff.h | 5 + include/linux/sock_diag.h | 14 +- include/net/net_namespace.h | 2 +- include/uapi/linux/bpf.h | 24 ++ kernel/bpf/reuseport_array.c | 2 +- net/core/filter.c | 304 ++++++++++++++++-- net/core/net_namespace.c | 9 +- net/core/sock_diag.c | 9 +- net/core/sock_map.c | 4 +- samples/bpf/sockex3_kern.c | 20 +- tools/include/uapi/linux/bpf.h | 24 ++ tools/lib/bpf/bpf_helpers.h | 46 +++ tools/testing/selftests/bpf/progs/bpf_flow.c | 12 +- tools/testing/selftests/bpf/progs/tailcall1.c | 28 +- tools/testing/selftests/bpf/progs/tailcall2.c | 14 +- tools/testing/selftests/bpf/progs/tailcall3.c | 4 +- .../selftests/bpf/progs/tailcall_bpf2bpf1.c | 4 +- .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 6 +- .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 6 +- .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 6 +- .../selftests/bpf/progs/test_tc_neigh.c | 144 +++++++++ tools/testing/selftests/bpf/test_tc_neigh.sh | 168 ++++++++++ 23 files changed, 826 insertions(+), 80 deletions(-) create mode 100644 include/linux/cookie.h create mode 100644 tools/testing/selftests/bpf/progs/test_tc_neigh.c create mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 1/6 bpf: add classid helper only based on skb->sk
Similarly to 5a52ae4e32a6 ("bpf: Allow to retrieve cgroup v1 classid from v2 hooks"), add a helper to retrieve cgroup v1 classid solely based on the skb->sk, so it can be used as key as part of BPF map lookups out of tc from host ns, in particular given the skb->sk is retained these days when crossing net ns thanks to 9c4c325252c5 ("skbuff: preserve sock reference when scrubbing the skb."). This is similar to bpf_skb_cgroup_id() which implements the same for v2. Kubernetes ecosystem is still operating on v1 however, hence net_cls needs to be used there until this can be dropped in with the v2 helper of bpf_skb_cgroup_id().
--- include/uapi/linux/bpf.h | 10 ++++++++++ net/core/filter.c | 21 +++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 10 ++++++++++ 3 files changed, 41 insertions(+)
include/uapi/linux/bpf.h +10 -0
@@ -3643,6 +3643,15 @@ union bpf_attr {* *flags* are identical to those used for bpf_snprintf_btf. * Return * 0 on success or a negative error in case of failure. +* +* u64 bpf_skb_cgroup_classid(struct sk_buff *skb) +* Description +* See **bpf_get_cgroup_classid**\ () for the main description. +* This helper differs from **bpf_get_cgroup_classid**\ () in that +* the cgroup v1 net_cls class is retrieved only from the *skb*'s +* associated socket instead of the current process. +* Return +* The id is returned or 0 in case the id could not be retrieved. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3796,6 +3805,7 @@ union bpf_attr {FN (copy_from_user), \FN (snprintf_btf), \FN (seq_printf_btf), \ +FN (skb_cgroup_classid), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
net/core/filter.c +21 -0
@@ -2707,6 +2707,23 @@ static const struct bpf_func_proto bpf_get_cgroup_classid_curr_proto = { .gpl_only = false, .ret_type = RET_INTEGER, }; + +BPF_CALL_1(bpf_skb_cgroup_classid, const struct sk_buff *, skb) +{ +struct sock *sk =skb_to_full_sk (skb); + +if (!sk || !sk_fullsock (sk)) +return 0 ; + +return sock_cgroup_classid (&sk->sk_cgrp_data); +} + +static const struct bpf_func_proto bpf_skb_cgroup_classid_proto = { + .func = bpf_skb_cgroup_classid, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX , +};#endif BPF_CALL_1(bpf_get_cgroup_classid, const struct sk_buff *, skb)
@@ -6772,6 +6789,10 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_FUNC_skb_get_xfrm_state:return &bpf_skb_get_xfrm_state_proto;#endif +#ifdef CONFIG_CGROUP_NET_CLASSID +case BPF_FUNC_skb_cgroup_classid: +return &bpf_skb_cgroup_classid_proto; +#endif #ifdef CONFIG_SOCK_CGROUP_DATA case BPF_FUNC_skb_cgroup_id:return &bpf_skb_cgroup_id_proto;
tools/include/uapi/linux/bpf.h +10 -0
@@ -3643,6 +3643,15 @@ union bpf_attr {* *flags* are identical to those used for bpf_snprintf_btf. * Return * 0 on success or a negative error in case of failure. +* +* u64 bpf_skb_cgroup_classid(struct sk_buff *skb) +* Description +* See **bpf_get_cgroup_classid**\ () for the main description. +* This helper differs from **bpf_get_cgroup_classid**\ () in that +* the cgroup v1 net_cls class is retrieved only from the *skb*'s +* associated socket instead of the current process. +* Return +* The id is returned or 0 in case the id could not be retrieved. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3796,6 +3805,7 @@ union bpf_attr {FN (copy_from_user), \FN (snprintf_btf), \FN (seq_printf_btf), \ +FN (skb_cgroup_classid), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 6/6 bpf, selftests: add redirect_neigh selftest
In reply to Daniel BorkmannAdd a small test that exercises the new redirect_neigh() helper for the IPv4 and IPv6 case.
--- .../selftests/bpf/progs/test_tc_neigh.c | 144 +++++++++++++++ tools/testing/selftests/bpf/test_tc_neigh.sh | 168 ++++++++++++++++++ 2 files changed, 312 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/test_tc_neigh.c create mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh
tools/testing/selftests/bpf/progs/test_tc_neigh.c new file +144 -0
@@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdint.h> +#include <stdbool.h> + +#include <linux/bpf.h> +#include <linux/stddef.h> +#include <linux/pkt_cls.h> +#include <linux/if_ether.h> +#include <linux/in.h> +#include <linux/ip.h> +#include <linux/ipv6.h> + +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_endian.h> + +#ifndef barrier_data +# define barrier_data (ptr) asm volatile("": :"r"(ptr) :"memory") +#endif + +#ifndef ctx_ptr +# define ctx_ptr (field) (void *)(long)(field) +#endif + +#define dst_to_src_tmp 0xeeddddeeU +#define src_to_dst_tmp 0xeeffffeeU + +#define ip4_src 0xac100164/* 172.16.1.100 */ +#define ip4_dst 0xac100264/* 172.16.2.100 */ + +#define ip6_src { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x01, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe } +#define ip6_dst { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x02, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe } + +#ifndef v6_equal +# define v6_equal (a, b) (a.s6_addr32[0] == b.s6_addr32[0] && \ + a.s6_addr32[1] == b.s6_addr32[1] && \ + a.s6_addr32[2] == b.s6_addr32[2] && \ + a.s6_addr32[3] == b.s6_addr32[3]) +#endif + +static __always_inline bool is_remote_ep_v4(struct __sk_buff *skb, +__be32 addr) +{ +void *data_end =ctx_ptr (skb->data_end); +void *data =ctx_ptr (skb->data); +struct iphdr *ip4h; + +if (data +sizeof (struct ethhdr ) > data_end) +return false; + + ip4h = (struct iphdr *)(data +sizeof (struct ethhdr )); +if ((void *)(ip4h +1 ) > data_end) +return false; + +return ip4h->daddr == addr; +} + +static __always_inline bool is_remote_ep_v6(struct __sk_buff *skb, +struct in6_addr addr) +{ +void *data_end =ctx_ptr (skb->data_end); +void *data =ctx_ptr (skb->data); +struct ipv6hdr *ip6h; + +if (data +sizeof (struct ethhdr ) > data_end) +return false; + + ip6h = (struct ipv6hdr *)(data +sizeof (struct ethhdr )); +if ((void *)(ip6h +1 ) > data_end) +return false; + +return v6_equal (ip6h->daddr, addr); +} + +SEC("chk_neigh") int tc_chk(struct __sk_buff *skb) +{ +void *data_end =ctx_ptr (skb->data_end); +void *data =ctx_ptr (skb->data); +__u32 *raw = data; + +if (data +sizeof (struct ethhdr ) > data_end) +return TC_ACT_SHOT ; + +return !raw[0 ] && !raw[1 ] && !raw[2 ] ?TC_ACT_SHOT :TC_ACT_OK ; +} + +SEC("dst_ingress") int tc_dst(struct __sk_buff *skb) +{ +int idx = dst_to_src_tmp; +__u8 zero[ETH_ALEN *2 ]; +bool redirect = false; + +switch (skb->protocol) { +case __bpf_constant_htons (ETH_P_IP ): + redirect =is_remote_ep_v4 (skb,__bpf_constant_htonl (ip4_src)); +break ; +case __bpf_constant_htons (ETH_P_IPV6 ): + redirect =is_remote_ep_v6 (skb, (struct in6_addr )ip6_src); +break ; + } + +if (!redirect) +return TC_ACT_OK ; + +barrier_data (&idx); + idx =bpf_ntohl (idx); + +__builtin_memset (&zero,0 ,sizeof (zero)); +if (bpf_skb_store_bytes (skb,0 , &zero,sizeof (zero),0 ) <0 ) +return TC_ACT_SHOT ; + +return bpf_redirect_neigh (idx,0 ); +} + +SEC("src_ingress") int tc_src(struct __sk_buff *skb) +{ +int idx = src_to_dst_tmp; +__u8 zero[ETH_ALEN *2 ]; +bool redirect = false; + +switch (skb->protocol) { +case __bpf_constant_htons (ETH_P_IP ): + redirect =is_remote_ep_v4 (skb,__bpf_constant_htonl (ip4_dst)); +break ; +case __bpf_constant_htons (ETH_P_IPV6 ): + redirect =is_remote_ep_v6 (skb, (struct in6_addr )ip6_dst); +break ; + } + +if (!redirect) +return TC_ACT_OK ; + +barrier_data (&idx); + idx =bpf_ntohl (idx); + +__builtin_memset (&zero,0 ,sizeof (zero)); +if (bpf_skb_store_bytes (skb,0 , &zero,sizeof (zero),0 ) <0 ) +return TC_ACT_SHOT ; + +return bpf_redirect_neigh (idx,0 ); +} + +char __license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_tc_neigh.sh new file +168 -0
168 lines not on this page · raw message
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 5/6 bpf, selftests: use bpf_tail_call_static where appropriate
In reply to Daniel BorkmannFor those locations where we use an immediate tail call map index use the newly added bpf_tail_call_static() helper.
--- samples/bpf/sockex3_kern.c | 20 +++++++------ tools/testing/selftests/bpf/progs/bpf_flow.c | 12 ++++---- tools/testing/selftests/bpf/progs/tailcall1.c | 28 +++++++++---------- tools/testing/selftests/bpf/progs/tailcall2.c | 14 +++++----- tools/testing/selftests/bpf/progs/tailcall3.c | 4 +-- .../selftests/bpf/progs/tailcall_bpf2bpf1.c | 4 +-- .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 6 ++-- .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 6 ++-- .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 6 ++-- 9 files changed, 51 insertions(+), 49 deletions(-)
samples/bpf/sockex3_kern.c +11 -9
@@ -31,28 +31,30 @@ struct {#define PARSE_IP 3#define PARSE_IPV6 4 -/* protocol dispatch routine. -* It tail-calls next BPF program depending on eth proto -* Note, we could have used: -* bpf_tail_call(skb, &jmp_table, proto); -* but it would need large prog_array +/* Protocol dispatch routine. It tail-calls next BPF program depending +* on eth proto. Note, we could have used ... +* +* bpf_tail_call(skb, &jmp_table, proto); +* +* ... but it would need large prog_array and cannot be optimised given +* the map key is not static. */ static inline void parse_eth_proto (struct __sk_buff *skb,u32 proto) {switch (proto) {case ETH_P_8021Q :case ETH_P_8021AD : -bpf_tail_call (skb, &jmp_table,PARSE_VLAN ); +bpf_tail_call_static (skb, &jmp_table,PARSE_VLAN );break ;case ETH_P_MPLS_UC :case ETH_P_MPLS_MC : -bpf_tail_call (skb, &jmp_table,PARSE_MPLS ); +bpf_tail_call_static (skb, &jmp_table,PARSE_MPLS );break ;case ETH_P_IP : -bpf_tail_call (skb, &jmp_table,PARSE_IP ); +bpf_tail_call_static (skb, &jmp_table,PARSE_IP );break ;case ETH_P_IPV6 : -bpf_tail_call (skb, &jmp_table,PARSE_IPV6 ); +bpf_tail_call_static (skb, &jmp_table,PARSE_IPV6 );break ; } }
tools/testing/selftests/bpf/progs/bpf_flow.c +6 -6
@@ -118,18 +118,18 @@ static __always_inline int parse_eth_proto(struct __sk_buff *skb, __be16 proto)switch (proto) {case bpf_htons (ETH_P_IP ): -bpf_tail_call (skb, &jmp_table,IP ); +bpf_tail_call_static (skb, &jmp_table,IP );break ;case bpf_htons (ETH_P_IPV6 ): -bpf_tail_call (skb, &jmp_table,IPV6 ); +bpf_tail_call_static (skb, &jmp_table,IPV6 );break ;case bpf_htons (ETH_P_MPLS_MC ):case bpf_htons (ETH_P_MPLS_UC ): -bpf_tail_call (skb, &jmp_table,MPLS ); +bpf_tail_call_static (skb, &jmp_table,MPLS );break ;case bpf_htons (ETH_P_8021Q ):case bpf_htons (ETH_P_8021AD ): -bpf_tail_call (skb, &jmp_table,VLAN ); +bpf_tail_call_static (skb, &jmp_table,VLAN );break ;default :/* Protocol not supported */
@@ -246,10 +246,10 @@ static __always_inline int parse_ipv6_proto(struct __sk_buff *skb, __u8 nexthdr)switch (nexthdr) {case IPPROTO_HOPOPTS :case IPPROTO_DSTOPTS : -bpf_tail_call (skb, &jmp_table,IPV6OP ); +bpf_tail_call_static (skb, &jmp_table,IPV6OP );break ;case IPPROTO_FRAGMENT : -bpf_tail_call (skb, &jmp_table,IPV6FR ); +bpf_tail_call_static (skb, &jmp_table,IPV6FR );break ;default :return parse_ip_proto (skb, nexthdr);
tools/testing/selftests/bpf/progs/tailcall1.c +14 -14
@@ -26,20 +26,20 @@ int entry(struct __sk_buff *skb)/* Multiple locations to make sure we patch * all of them. */ -bpf_tail_call (skb, &jmp_table,0 ); -bpf_tail_call (skb, &jmp_table,0 ); -bpf_tail_call (skb, &jmp_table,0 ); -bpf_tail_call (skb, &jmp_table,0 ); - -bpf_tail_call (skb, &jmp_table,1 ); -bpf_tail_call (skb, &jmp_table,1 ); -bpf_tail_call (skb, &jmp_table,1 ); -bpf_tail_call (skb, &jmp_table,1 ); - -bpf_tail_call (skb, &jmp_table,2 ); -bpf_tail_call (skb, &jmp_table,2 ); -bpf_tail_call (skb, &jmp_table,2 ); -bpf_tail_call (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 ); + +bpf_tail_call_static (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 ); + +bpf_tail_call_static (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 );return 3 ; }
tools/testing/selftests/bpf/progs/tailcall2.c +7 -7
@@ -13,14 +13,14 @@ struct { SEC("classifier/0")int bpf_func_0 (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 );return 0 ; } SEC("classifier/1")int bpf_func_1 (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 );return 1 ; }
@@ -33,25 +33,25 @@ int bpf_func_2(struct __sk_buff *skb) SEC("classifier/3")int bpf_func_3 (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,4 ); +bpf_tail_call_static (skb, &jmp_table,4 );return 3 ; } SEC("classifier/4")int bpf_func_4 (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,3 ); +bpf_tail_call_static (skb, &jmp_table,3 );return 4 ; } SEC("classifier")int entry (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );/* Check multi-prog update. */ -bpf_tail_call (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 );/* Check tail call limit. */ -bpf_tail_call (skb, &jmp_table,3 ); +bpf_tail_call_static (skb, &jmp_table,3 );return 3 ; }
tools/testing/selftests/bpf/progs/tailcall3.c +2 -2
@@ -16,14 +16,14 @@ SEC("classifier/0")int bpf_func_0 (struct __sk_buff *skb) { count++; -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return 1 ; } SEC("classifier")int entry (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return 0 ; }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf1.c +2 -2
@@ -21,7 +21,7 @@ TAIL_FUNC(1)static __noinline int subprog_tail(struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return skb->len *2 ; }
@@ -29,7 +29,7 @@ int subprog_tail(struct __sk_buff *skb) SEC("classifier")int entry (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 );return subprog_tail (skb); }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf2.c +3 -3
@@ -14,9 +14,9 @@ static __noinlineint subprog_tail (struct __sk_buff *skb) {if (load_byte (skb,0 )) -bpf_tail_call (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 );else -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return 1 ; }
@@ -32,7 +32,7 @@ int bpf_func_0(struct __sk_buff *skb) SEC("classifier")int entry (struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return 0 ; }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf3.c +3 -3
@@ -16,9 +16,9 @@ int subprog_tail2(struct __sk_buff *skb)volatile char arr[64 ] = {};if (load_word (skb,0 ) ||load_half (skb,0 )) -bpf_tail_call (skb, &jmp_table,10 ); +bpf_tail_call_static (skb, &jmp_table,10 );else -bpf_tail_call (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 );return skb->len; }
@@ -28,7 +28,7 @@ int subprog_tail(struct __sk_buff *skb) {volatile char arr[64 ] = {}; -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return skb->len *2 ; }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf4.c +3 -3
@@ -14,21 +14,21 @@ static volatile int count;__noinline int subprog_tail_2(struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,2 ); +bpf_tail_call_static (skb, &jmp_table,2 );return skb->len *3 ; }__noinline int subprog_tail_1(struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,1 ); +bpf_tail_call_static (skb, &jmp_table,1 );return skb->len *2 ; }__noinline int subprog_tail(struct __sk_buff *skb) { -bpf_tail_call (skb, &jmp_table,0 ); +bpf_tail_call_static (skb, &jmp_table,0 );return skb->len; }
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 2/6 bpf, net: rework cookie generator as per-cpu one
In reply to Daniel BorkmannWith its use in BPF, the cookie generator can be called very frequently in particular when used out of cgroup v2 hooks (e.g. connect / sendmsg) and attached to the root cgroup, for example, when used in v1/v2 mixed environments. In particular, when there's a high churn on sockets in the system there can be many parallel requests to the bpf_get_socket_cookie() and bpf_get_netns_cookie() helpers which then cause contention on the atomic counter.
As similarly done in f991bd2e1421 ("fs: introduce a per-cpu last_ino allocator"), add a small helper library that both can use for the 64 bit counters. Given this can be called from different contexts, we also need to deal with potential nested calls even though in practice they are considered extremely rare. One idea as suggested by Eric Dumazet was to use a reverse counter for this situation since we don't expect 64 bit overflows anyways; that way, we can avoid bigger gaps in the 64 bit counter space compared to just batch-wise increase. Even on machines with small number of cores (e.g. 4) the cookie generation shrinks from min/max/med/avg (ns) of 22/50/40/38.9 down to 10/35/14/17.3 when run in parallel from multiple CPUs.
--- include/linux/cookie.h | 51 ++++++++++++++++++++++++++++++++++++ include/linux/sock_diag.h | 14 +++++++++- include/net/net_namespace.h | 2 +- kernel/bpf/reuseport_array.c | 2 +- net/core/filter.c | 10 +++---- net/core/net_namespace.c | 9 ++++--- net/core/sock_diag.c | 9 ++++--- net/core/sock_map.c | 4 +-- 8 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 include/linux/cookie.h
include/linux/cookie.h new file +51 -0
@@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_COOKIE_H +#define __LINUX_COOKIE_H + +#include <linux/atomic.h> +#include <linux/percpu.h> +#include <asm/local.h> + +struct pcpu_gen_cookie { +local_t nesting; +u64 last; +}__aligned(16) ; + +struct gen_cookie { +struct pcpu_gen_cookie __percpu *local; +atomic64_t forward_last____cacheline_aligned_in_smp ; +atomic64_t reverse_last; +}; + +#define COOKIE_LOCAL_BATCH 4096 + +#define DEFINE_COOKIE (name) \ + static DEFINE_PER_CPU(struct pcpu_gen_cookie, __##name); \ + static struct gen_cookie name = { \ + .local = &__##name, \ + .forward_last = ATOMIC64_INIT(0), \ + .reverse_last = ATOMIC64_INIT(0), \ + } + +static __always_inline u64 gen_cookie_next(struct gen_cookie *gc) +{ +struct pcpu_gen_cookie *local =this_cpu_ptr (gc->local); +u64 val; + +if (likely (local_inc_return (&local->nesting) ==1 )) { + val = local->last; +if (__is_defined (CONFIG_SMP ) && +unlikely ((val & (COOKIE_LOCAL_BATCH -1 )) ==0 )) { +s64 next =atomic64_add_return (COOKIE_LOCAL_BATCH , + &gc->forward_last); + val = next -COOKIE_LOCAL_BATCH ; + } + local->last = ++val; + }else { + val =atomic64_dec_return (&gc->reverse_last); + } +local_dec (&local->nesting); +return val; +} + +#endif /* __LINUX_COOKIE_H */
include/linux/sock_diag.h +13 -1
@@ -25,7 +25,19 @@ void sock_diag_unregister(const struct sock_diag_handler *h);void sock_diag_register_inet_compat (int (*fn)(struct sk_buff *skb,struct nlmsghdr *nlh));void sock_diag_unregister_inet_compat (int (*fn)(struct sk_buff *skb,struct nlmsghdr *nlh)); -u64 sock_gen_cookie (struct sock *sk); +u64 __sock_gen_cookie (struct sock *sk); + +static inline u64 sock_gen_cookie (struct sock *sk) +{ +u64 cookie; + +preempt_disable (); + cookie =__sock_gen_cookie (sk); +preempt_enable (); + +return cookie; +} +int sock_diag_check_cookie (struct sock *sk,const __u32 *cookie);void sock_diag_save_cookie (struct sock *sk,__u32 *cookie);
include/net/net_namespace.h +1 -1
@@ -230,7 +230,7 @@ extern struct list_head net_namespace_list;struct net *get_net_ns_by_pid (pid_t pid);struct net *get_net_ns_by_fd (int fd); -u64 net_gen_cookie (struct net *net); +u64 __net_gen_cookie (struct net *net);#ifdef CONFIG_SYSCTL void ipx_register_sysctl (void );
kernel/bpf/reuseport_array.c +1 -1
@@ -191,7 +191,7 @@ int bpf_fd_reuseport_array_lookup_elem(struct bpf_map *map, void *key,rcu_read_lock (); sk =reuseport_array_lookup_elem (map, key);if (sk) { - *(u64 *)value =sock_gen_cookie (sk); + *(u64 *)value =__sock_gen_cookie (sk); err =0 ; }else { err = -ENOENT ;
net/core/filter.c +5 -5
@@ -4232,7 +4232,7 @@ const struct bpf_func_proto bpf_xdp_output_proto = { BPF_CALL_1(bpf_get_socket_cookie, struct sk_buff *, skb) { -return skb->sk ?sock_gen_cookie (skb->sk) :0 ; +return skb->sk ?__sock_gen_cookie (skb->sk) :0 ; }static const struct bpf_func_proto bpf_get_socket_cookie_proto = {
@@ -4244,7 +4244,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_proto = { BPF_CALL_1(bpf_get_socket_cookie_sock_addr, struct bpf_sock_addr_kern *, ctx) { -return sock_gen_cookie (ctx->sk); +return __sock_gen_cookie (ctx->sk); }static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = {
@@ -4256,7 +4256,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = { BPF_CALL_1(bpf_get_socket_cookie_sock, struct sock *, ctx) { -return sock_gen_cookie (ctx); +return __sock_gen_cookie (ctx); }static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = {
@@ -4268,7 +4268,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = { BPF_CALL_1(bpf_get_socket_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx) { -return sock_gen_cookie (ctx->sk); +return __sock_gen_cookie (ctx->sk); }static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = {
@@ -4281,7 +4281,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = {static u64 __bpf_get_netns_cookie (struct sock *sk) {#ifdef CONFIG_NET_NS -return net_gen_cookie (sk ? sk->sk_net.net : &init_net); +return __net_gen_cookie (sk ? sk->sk_net.net : &init_net);#else return 0 ;#endif
net/core/net_namespace.c +5 -4
@@ -19,6 +19,7 @@#include <linux/net_namespace.h> #include <linux/sched/task.h> #include <linux/uidgid.h> +#include <linux/cookie.h> #include <net/sock.h> #include <net/netlink.h>
@@ -69,16 +70,16 @@ EXPORT_SYMBOL_GPL(pernet_ops_rwsem);static unsigned int max_gen_ptrs =INITIAL_NET_GEN_PTRS ; -static atomic64_t cookie_gen; +DEFINE_COOKIE (net_cookie); -u64 net_gen_cookie (struct net *net) +u64 __net_gen_cookie (struct net *net) {while (1 ) {u64 res =atomic64_read (&net->net_cookie);if (res)return res; - res =atomic64_inc_return (&cookie_gen); + res =gen_cookie_next (&net_cookie);atomic64_cmpxchg (&net->net_cookie,0 , res); } }
@@ -1101,7 +1102,7 @@ static int __init net_ns_init(void)panic ("Could not allocate generic netns" );rcu_assign_pointer (init_net.gen, ng); -net_gen_cookie (&init_net); +__net_gen_cookie (&init_net);down_write (&pernet_ops_rwsem);if (setup_net (&init_net, &init_user_ns))
net/core/sock_diag.c +5 -4
@@ -11,7 +11,7 @@#include <linux/tcp.h> #include <linux/workqueue.h> #include <linux/nospec.h> - +#include <linux/cookie.h> #include <linux/inet_diag.h> #include <linux/sock_diag.h>
@@ -19,16 +19,17 @@ static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];static int (*inet_rcv_compat)(struct sk_buff *skb,struct nlmsghdr *nlh);static DEFINE_MUTEX (sock_diag_table_mutex);static struct workqueue_struct *broadcast_wq; -static atomic64_t cookie_gen; -u64 sock_gen_cookie (struct sock *sk) +DEFINE_COOKIE (sock_cookie); + +u64 __sock_gen_cookie (struct sock *sk) {while (1 ) {u64 res =atomic64_read (&sk->sk_cookie);if (res)return res; - res =atomic64_inc_return (&cookie_gen); + res =gen_cookie_next (&sock_cookie);atomic64_cmpxchg (&sk->sk_cookie,0 , res); } }
net/core/sock_map.c +2 -2
@@ -401,7 +401,7 @@ static void *sock_map_lookup_sys(struct bpf_map *map, void *key)if (!sk)return ERR_PTR (-ENOENT ); -sock_gen_cookie (sk); +__sock_gen_cookie (sk);return &sk->sk_cookie; }
@@ -1209,7 +1209,7 @@ static void *sock_hash_lookup_sys(struct bpf_map *map, void *key)if (!sk)return ERR_PTR (-ENOENT ); -sock_gen_cookie (sk); +__sock_gen_cookie (sk);return &sk->sk_cookie; }
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 3/6 bpf: add redirect_neigh helper as redirect drop-in
In reply to Daniel BorkmannAdd a redirect_neigh() helper as redirect() drop-in replacement for the xmit side. Main idea for the helper is to be very similar in semantics to the latter just that the skb gets injected into the neighboring subsystem in order to let the stack do the work it knows best anyway to populate the L2 addresses of the packet and then hand over to dev_queue_xmit() as redirect() does.
This solves two bigger items: i) skbs don't need to go up to the stack on the host facing veth ingress side for traffic egressing the container to achieve the same for populating L2 which also has the huge advantage that ii) the skb->sk won't get orphaned in ip_rcv_core() when entering the IP routing layer on the host stack.
Given that skb->sk neither gets orphaned when crossing the netns as per 9c4c325252c5 ("skbuff: preserve sock reference when scrubbing the skb.") the helper can then push the skbs directly to the phys device where FQ scheduler can do its work and TCP stack gets proper backpressure given we hold on to skb->sk as long as skb is still residing in queues.
With the helper used in BPF data path to then push the skb to the phys device, I observed a stable/consistent TCP_STREAM improvement on veth devices for traffic going container -> host -> host -> container from ~10Gbps to ~15Gbps for a single stream in my test environment.
--- include/linux/skbuff.h | 5 + include/uapi/linux/bpf.h | 14 ++ net/core/filter.c | 273 +++++++++++++++++++++++++++++++-- tools/include/uapi/linux/bpf.h | 14 ++ 4 files changed, 293 insertions(+), 13 deletions(-)
include/linux/skbuff.h +5 -0
@@ -2548,6 +2548,11 @@ static inline int skb_mac_header_was_set(const struct sk_buff *skb) return skb->mac_header != (typeof(skb->mac_header))~0U; } +static inline void skb_unset_mac_header (struct sk_buff *skb) +{ + skb->mac_header = (typeof(skb->mac_header))~0U; +} +static inline void skb_reset_mac_header (struct sk_buff *skb) { skb->mac_header = skb->data - skb->head;
include/uapi/linux/bpf.h +14 -0
@@ -3652,6 +3652,19 @@ union bpf_attr {* associated socket instead of the current process. * Return * The id is returned or 0 in case the id could not be retrieved. +* +* long bpf_redirect_neigh(u32 ifindex, u64 flags) +* Description +* Redirect the packet to another net device of index *ifindex* +* and fill in L2 addresses from neighboring subsystem. This helper +* is somewhat similar to **bpf_redirect**\ (), except that it +* fills in e.g. MAC addresses based on the L3 information from +* the packet. This helper is supported for IPv4 and IPv6 protocols. +* The *flags* argument is reserved and must be 0. The helper is +* currently only supported for tc BPF program types. +* Return +* The helper returns **TC_ACT_REDIRECT** on success or +* **TC_ACT_SHOT** on error. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3806,6 +3819,7 @@ union bpf_attr {FN (snprintf_btf), \FN (seq_printf_btf), \FN (skb_cgroup_classid), \ +FN (redirect_neigh), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
net/core/filter.c +260 -13
308 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +14 -0
@@ -3652,6 +3652,19 @@ union bpf_attr {* associated socket instead of the current process. * Return * The id is returned or 0 in case the id could not be retrieved. +* +* long bpf_redirect_neigh(u32 ifindex, u64 flags) +* Description +* Redirect the packet to another net device of index *ifindex* +* and fill in L2 addresses from neighboring subsystem. This helper +* is somewhat similar to **bpf_redirect**\ (), except that it +* fills in e.g. MAC addresses based on the L3 information from +* the packet. This helper is supported for IPv4 and IPv6 protocols. +* The *flags* argument is reserved and must be 0. The helper is +* currently only supported for tc BPF program types. +* Return +* The helper returns **TC_ACT_REDIRECT** on success or +* **TC_ACT_SHOT** on error. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3806,6 +3819,7 @@ union bpf_attr {FN (snprintf_btf), \FN (seq_printf_btf), \FN (skb_cgroup_classid), \ +FN (redirect_neigh), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v3 4/6 bpf, libbpf: add bpf_tail_call_static helper for bpf programs
In reply to Daniel BorkmannPort of tail_call_static() helper function from Cilium's BPF code base [0] to libbpf, so others can easily consume it as well. We've been using this in production code for some time now. The main idea is that we guarantee that the kernel's BPF infrastructure and JIT (here: x86_64) can patch the JITed BPF insns with direct jumps instead of having to fall back to using expensive retpolines. By using inline asm, we guarantee that the compiler won't merge the call from different paths with potentially different content of r2/r3.
We're also using Cilium's __throw_build_bug() macro (here as: __bpf_unreachable()) in different places as a neat trick to trigger compilation errors when compiler does not remove code at compilation time. This works for the BPF back end as it does not implement the __builtin_trap().
[0] https://github.com/cilium/cilium/commit/f5537c26020d5297b70936c6b7d03a1e412a1035
--- tools/lib/bpf/bpf_helpers.h | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
tools/lib/bpf/bpf_helpers.h +46 -0
@@ -53,6 +53,52 @@ })#endif +/* +* Helper macro to throw a compilation error if __bpf_unreachable() gets +* built into the resulting code. This works given BPF back end does not +* implement __builtin_trap(). This is useful to assert that certain paths +* of the program code are never used and hence eliminated by the compiler. +* +* For example, consider a switch statement that covers known cases used by +* the program. __bpf_unreachable() can then reside in the default case. If +* the program gets extended such that a case is not covered in the switch +* statement, then it will throw a build error due to the default case not +* being compiled out. +*/ +#ifndef __bpf_unreachable +# define __bpf_unreachable () __builtin_trap() +#endif + +/* +* Helper function to perform a tail call with a constant/immediate map slot. +*/ +static __always_inline void +bpf_tail_call_static (void *ctx,const void *map,const __u32 slot) +{ +if (!__builtin_constant_p (slot)) +__bpf_unreachable (); + +/* +* Provide a hard guarantee that LLVM won't optimize setting r2 (map +* pointer) and r3 (constant map index) from _different paths_ ending +* up at the _same_ call insn as otherwise we won't be able to use the +* jmpq/nopl retpoline-free patching by the x86-64 JIT in the kernel +* given they mismatch. See also d2e4c1e6c294 ("bpf: Constant map key +* tracking for prog array pokes") for details on verifier tracking. +* +* Note on clobber list: we need to stay in-line with BPF calling +* convention, so even if we don't end up using r0, r4, r5, we need +* to mark them as clobber so that LLVM doesn't end up using them +* before / after the call. +*/ + asmvolatile ("r1 = %[ctx]\n\t" +"r2 = %[map]\n\t" +"r3 = %[slot]\n\t" +"call 12" + :: [ctx]"r" (ctx), [map]"r" (map), [slot]"i" (slot) + :"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ); +} +/* * Helper structure used by eBPF C program * to describe BPF map attributes to libbpf loader
Signature · 1 line
2.21.0
Re: [PATCH bpf-next v3 1/6] bpf: add classid helper only based on skb->sk
In reply to Daniel BorkmannQuoted 10 lines · Daniel Borkmann
Similarly to
5a52ae4e32a6("bpf: Allow to retrieve cgroup v1 classid from v2 hooks"), add a helper to retrieve cgroup v1 classid solely based on theskb->sk, so it can be used as key as part of BPF map lookups out of tc from host ns, in particular given theskb->skis retained these days when crossing net ns thanks to9c4c325252c5("skbuff: preserve sock reference when scrubbing the skb."). This is similar tobpf_skb_cgroup_id()which implements the same for v2. Kubernetes ecosystem is still operating on v1 however, hencenet_clsneeds to be used there until this can be dropped in with the v2 helper ofbpf_skb_cgroup_id().
Re: [PATCH bpf-next v3 2/6] bpf, net: rework cookie generator as per-cpu one
In reply to Daniel BorkmannQuoted 8 lines · Daniel Borkmann
With its use in BPF, the cookie generator can be called very frequently in particular when used out of cgroup v2 hooks (e.g. connect / sendmsg) and attached to the root cgroup, for example, when used in v1/v2 mixed environments. In particular, when there's a high churn on sockets in the system there can be many parallel requests to the
bpf_get_socket_cookie()andbpf_get_netns_cookie()helpers which then cause contention on the atomic counter.
Quoted 11 lines
As similarly done in
f991bd2e1421("fs: introduce a per-cpulast_inoallocator"), add a small helper library that both can use for the 64 bit counters. Given this can be called from different contexts, we also need to deal with potential nested calls even though in practice they are considered extremely rare. One idea as suggested by Eric Dumazet was to use a reverse counter for this situation since we don't expect 64 bit overflows anyways; that way, we can avoid bigger gaps in the 64 bit counter space compared to just batch-wise increase. Even on machines with small number of cores (e.g. 4) the cookie generation shrinks from min/max/med/avg (ns) of 22/50/40/38.9 down to 10/35/14/17.3 when run in parallel from multiple CPUs.
Re: [PATCH bpf-next v3 3/6] bpf: add redirect_neigh helper as redirect drop-in
In reply to Daniel BorkmannOn Tue, Sep 29, 2020 at 11:23:03PM +0200, Daniel Borkmann wrote:
[ ... ]
Quoted 105 lines
--- include/linux/skbuff.h | 5 + include/uapi/linux/bpf.h | 14 ++ net/core/filter.c | 273 +++++++++++++++++++++++++++++++-- tools/include/uapi/linux/bpf.h | 14 ++ 4 files changed, 293 insertions(+), 13 deletions(-)include/linux/skbuff.h +5
-0@@ -2548,6 +2548,11 @@ static inline int skb_mac_header_was_set(const struct sk_buff *skb) return skb->mac_header != (typeof(skb->mac_header))~0U; } +static inline void skb_unset_mac_header (struct sk_buff *skb) +{ + skb->mac_header = (typeof(skb->mac_header))~0U; +} +static inline void skb_reset_mac_header (struct sk_buff *skb) { skb->mac_header = skb->data - skb->head;include/uapi/linux/bpf.h +14
-0@@ -3652,6 +3652,19 @@ union bpf_attr {* associated socket instead of the current process. * Return * The id is returned or 0 in case the id could not be retrieved. +* +* long bpf_redirect_neigh(u32 ifindex, u64 flags) +* Description +* Redirect the packet to another net device of index *ifindex* +* and fill in L2 addresses from neighboring subsystem. This helper +* is somewhat similar to **bpf_redirect**\ (), except that it +* fills in e.g. MAC addresses based on the L3 information from +* the packet. This helper is supported for IPv4 and IPv6 protocols. +* The *flags* argument is reserved and must be 0. The helper is +* currently only supported for tc BPF program types. +* Return +* The helper returns **TC_ACT_REDIRECT** on success or +* **TC_ACT_SHOT** on error. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \@@ -3806,6 +3819,7 @@ union bpf_attr {FN (snprintf_btf), \FN (seq_printf_btf), \FN (skb_cgroup_classid), \ +FN (redirect_neigh), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper net/core/filter.c +42
-0@@ -2163,6 +2163,222 @@ static int __bpf_redirect(struct sk_buff *skb, struct net_device *dev,return __bpf_redirect_no_mac (skb, dev, flags); } +#if IS_ENABLED (CONFIG_IPV6 ) +static int bpf_out_neigh_v6 (struct net *net,struct sk_buff *skb) +{ +struct dst_entry *dst =skb_dst (skb); +struct net_device *dev = dst->dev; +u32 hh_len =LL_RESERVED_SPACE (dev); +const struct in6_addr *nexthop; +struct neighbour *neigh; + +if (dev_xmit_recursion ()) + goto out_rec; + + skb->dev = dev; + skb->tstamp =0 ; + +if (unlikely (skb_headroom (skb) < hh_len && dev->header_ops)) { +struct sk_buff *skb2; + + skb2 =skb_realloc_headroom (skb, hh_len); +if (!skb2) { +kfree_skb (skb); +return -ENOMEM ; + } +if (skb->sk) +skb_set_owner_w (skb2, skb->sk); +consume_skb (skb); + skb = skb2; + } + +rcu_read_lock_bh (); + nexthop = rt6_nexthop(container_of(dst, struct rt6_info, dst), + &ipv6_hdr (skb)->daddr); + neigh =ip_neigh_gw6 (dev, nexthop); +if (likely (!IS_ERR (neigh))) { +int ret; + +sock_confirm_neigh (skb, neigh); +dev_xmit_recursion_inc (); + ret =neigh_output (neigh, skb, false); +dev_xmit_recursion_dec (); +rcu_read_unlock_bh (); +return ret;
net/core/filter.c static int __bpf_redirect(struct sk_buff *skb, struct net_device *dev, · line 2217
Quoted 10 lines
net/core/filter.c +10
-0+ } +rcu_read_unlock_bh (); +IP6_INC_STATS (dev_net (dst->dev), +ip6_dst_idev (dst),IPSTATS_MIB_OUTNOROUTES ); +out_drop: +kfree_skb (skb); +return -EINVAL ; +out_rec: +net_crit_ratelimited ("bpf: recursion limit reached on datapath, buggy bpf program?\n" ); + goto out_drop;
nit. may be log this at the earlier "if (dev_xmit_recursion)" and then directly goto out_drop.
Quoted 2 lines
net/core/filter.c +2
-0+} +
[ ... ]
net/core/filter.c static const struct bpf_func_proto bpf_clone_redirect_proto = { · line 2428
Quoted 4 lines
net/core/filter.c +4
-0+/* Internal, non-exposed redirect flags. */ +enum { +BPF_F_NEIGH = (1ULL <<1 ), +};
It will be useful to ensure the future "flags" of BPF_FUNC_redirect will not overlap with this. May be a BUILD_BUG_ON?
Others LGTM.
Quoted 18 lines
int
skb_do_redirect(struct sk_buff *skb)
{net/core/filter.c +5
-1struct bpf_redirect_info *ri =this_cpu_ptr (&bpf_redirect_info);struct net_device *dev; +u32 flags = ri->flags; dev =dev_get_by_index_rcu (dev_net (skb->dev), ri->tgt_index); ri->tgt_index =0 ;@@ -2231,7 +2440,22 @@ int skb_do_redirect(struct sk_buff *skb)return -EINVAL ; } -return __bpf_redirect (skb, dev, ri->flags); +return flags &BPF_F_NEIGH ? +__bpf_redirect_neigh (skb, dev) : +__bpf_redirect (skb, dev, flags); +}
Daniel Borkmann
maintainerRe: [PATCH bpf-next v3 3/6] bpf: add redirect_neigh helper as redirect drop-in
Quoted 1 line · Martin KaFai Lau
On Tue, Sep 29, 2020 at 11:23:03PM +0200, Daniel Borkmann wrote:
[...]
Quoted 7 lines
net/core/filter.c static const struct bpf_func_proto bpf_clone_redirect_proto = { · line 2428
Quoted 5 lines
net/core/filter.c +4
-0+/* Internal, non-exposed redirect flags. */ +enum { +BPF_F_NEIGH = (1ULL <<1 ), +};It will be useful to ensure the future "flags" of
BPF_FUNC_redirectwill not overlap with this. May be aBUILD_BUG_ON?
I was thinking about this as well, but didn't go for it since typically this would mean that we need to add a mask of all flags for redirect helper in uapi right next to where we define BPF_F_INGRESS such that people don't forget to update the mask whenever they extend the flags there in order for the BUILD_BUG_ON() assertion to be actually effective (see also RTAX_FEATURE_MASK vs DST_FEATURE_MASK). If the mask sits in a different location, then developers might forget to update, it might slip through review (since not included in diff) and the build failure doesn't trigger. So far we have avoided to extend bpf uapi in such way. That was basically my rationale, another option could be to just add a comment in the enum right underneath BPF_F_INGRESS that the (1ULL << 1) bit is currently kernel-internal.
Quoted 3 lines
Others LGTM.
Acked-by Martin KaFai Lau <[email protected]>
Thanks!
bpf_program__set_attach_target(prog, 0, "foo") cannot possibly work ?
In reply to Daniel BorkmannHi,
I am trying to use
bpf_program__set_attach_target(prog, 0, "foo")
to override the attach point for a bpf program, and it seems that it cannot possibly work because the function depends on prog->obj->btf_vmlinux being !NULL.
The only place in libbpf that sets btf_vmlinux is this:
2495 static int bpf_object__load_vmlinux_btf(struct bpf_object *obj) ... 2517 obj->btf_vmlinux = libbpf_find_kernel_btf();
and this is only called within the function below, which also clears the field once done.
5890 int bpf_object__load_xattr(struct bpf_object_load_attr *attr) ... 5911 err = err ? : bpf_object__load_vmlinux_btf(obj); ... 5917 btf__free(obj->btf_vmlinux);
I don't know exactly what is the plan with that field, hence what is the best way to fix the problem. I can suggest a couple below:
index 7253b833576c..28288d4c992b 100644
tools/lib/bpf/libbpf.c +0 -0
@@ -9128,10 +9128,18 @@ int bpf_program__set_attach_target(struct
bpf_program *prog,
if (attach_prog_fd)
btf_id = libbpf_find_prog_btf_id(attach_func_name,
attach_prog_fd);
- else
- btf_id = __find_vmlinux_btf_id(prog->obj->btf_vmlinux,
+ else {
+ struct btf *btf = prog->obj->btf_vmlinux;
+
+ if (!btf)
+ btf = libbpf_find_kernel_btf();
+
+ btf_id = __find_vmlinux_btf_id(btf,
attach_func_name,
prog->expected_attach_type);+ if (!prog->obj->btf_vmlinux)
+ btf_free(btf);
+ }
if (btf_id < 0)
return btf_id;or possibly even simpler
index 7253b833576c..a9870e9dc67a 100644
tools/lib/bpf/libbpf.c +0 -0
@@ -9128,10 +9128,14 @@ int bpf_program__set_attach_target(struct
bpf_program *prog,
if (attach_prog_fd)
btf_id = libbpf_find_prog_btf_id(attach_func_name,
attach_prog_fd);
- else
- btf_id = __find_vmlinux_btf_id(prog->obj->btf_vmlinux,
- attach_func_name,
+ else {
+ struct btf *btf = libbpf_find_kernel_btf();
+
+ btf_id = __find_vmlinux_btf_id(btf, attach_func_name,
prog->expected_attach_type);
+ if (btf)
+ btf_free(btf);
+ }
if (btf_id < 0)
return btf_id;---
Does the above make sense ?
cheers
luigi