Follow-up BPF helper improvements
Subsystems (7)
Daniel Borkmann
maintainerv2 cover Follow-up BPF helper improvements
This series addresses most of the feedback [0] that was to be followed up from the last series, that is, UAPI helper comment improvements and getting rid of the ifindex obj file hacks in the selftest by using a BPF map instead. The __sk_buff data/data_end pointer work, I'm planning to do in a later round as well as the mem*() BPF improvements we have in Cilium for libbpf. Next, the series adds two features, i) a helper called redirect_peer() to improve latency on netns switch, and ii) to allow map in map with dynamic inner array map sizes. Selftests for each are added as well. For details, please check individual patches, thanks!
[0] https://lore.kernel.org/bpf/[email protected]/
v1 -> v2:
- Fixed selftest comment wrt inner1/inner2 value (Yonghong)
Daniel Borkmann (6):
bpf: improve bpf_redirect_neigh helper description
bpf: add redirect_peer helper
bpf: allow for map-in-map with dynamic inner array map entries bpf, selftests: add test for different array inner map size bpf, selftests: make redirect_neigh test more extensible bpf, selftests: add redirect_peer selftest
drivers/net/veth.c | 9 + include/linux/bpf.h | 1 + include/linux/netdevice.h | 4 + include/uapi/linux/bpf.h | 32 ++- kernel/bpf/arraymap.c | 40 +++- kernel/bpf/syscall.c | 3 +- net/core/dev.c | 15 +- net/core/filter.c | 54 ++++- tools/include/uapi/linux/bpf.h | 32 ++- .../selftests/bpf/prog_tests/btf_map_in_map.c | 39 +++- .../selftests/bpf/progs/test_btf_map_in_map.c | 43 ++++ .../selftests/bpf/progs/test_tc_neigh.c | 40 ++-- .../selftests/bpf/progs/test_tc_peer.c | 45 ++++ tools/testing/selftests/bpf/test_tc_neigh.sh | 168 --------------- .../testing/selftests/bpf/test_tc_redirect.sh | 204 ++++++++++++++++++ 15 files changed, 514 insertions(+), 215 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_tc_peer.c delete mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh create mode 100755 tools/testing/selftests/bpf/test_tc_redirect.sh
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v2 1/6 bpf: improve bpf_redirect_neigh helper description
Follow-up to address David's feedback that we should better describe internals of the bpf_redirect_neigh() helper.
--- include/uapi/linux/bpf.h | 10 +++++++--- tools/include/uapi/linux/bpf.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
include/uapi/linux/bpf.h +7 -3
@@ -3679,10 +3679,14 @@ union bpf_attr {* 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. +* populates L2 addresses as well, meaning, internally, the helper +* performs a FIB lookup based on the skb's networking header to +* get the address of the next hop and then relies on the neighbor +* lookup for the L2 address of the nexthop. +* * The *flags* argument is reserved and must be 0. The helper is -* currently only supported for tc BPF program types. +* currently only supported for tc BPF program types, and enabled +* for IPv4 and IPv6 protocols. * Return * The helper returns **TC_ACT_REDIRECT** on success or * **TC_ACT_SHOT** on error.
tools/include/uapi/linux/bpf.h +7 -3
@@ -3679,10 +3679,14 @@ union bpf_attr {* 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. +* populates L2 addresses as well, meaning, internally, the helper +* performs a FIB lookup based on the skb's networking header to +* get the address of the next hop and then relies on the neighbor +* lookup for the L2 address of the nexthop. +* * The *flags* argument is reserved and must be 0. The helper is -* currently only supported for tc BPF program types. +* currently only supported for tc BPF program types, and enabled +* for IPv4 and IPv6 protocols. * Return * The helper returns **TC_ACT_REDIRECT** on success or * **TC_ACT_SHOT** on error.
Signature · 1 line
2.21.0
Jakub Kicinski
maintainerRe: [PATCH bpf-next v2 1/6] bpf: improve bpf_redirect_neigh helper description
Quoted 1 line · On Fri, 9 Oct 2020 16:10:10 +0200 Daniel Borkmann wrote:
+ * get the address of the next hop and then relies on the neighbor
FWIW if you have to respin there is a tab in the middle of this line
Quoted 1 line
+ * get the address of the next hop and then relies on the neighbor
Also copied here.
Daniel Borkmann
maintainerPATCH v2 2/6 bpf: add redirect_peer helper
In reply to Daniel BorkmannAdd an efficient ingress to ingress netns switch that can be used out of tc BPF programs in order to redirect traffic from host ns ingress into a container veth device ingress without having to go via CPU backlog queue [0]. For local containers this can also be utilized and path via CPU backlog queue only needs to be taken once, not twice. On a high level this borrows from ipvlan which does similar switch in __netif_receive_skb_core() and then iterates via another_round. This helps to reduce latency for mentioned use cases.
Pod to remote pod with redirect(), TCP_RR [1]:
# percpu_netperf 10.217.1.33
RT_LATENCY: 122.450 (per CPU: 122.666 122.401 122.333 122.401 )
MEAN_LATENCY: 121.210 (per CPU: 121.100 121.260 121.320 121.160 )
STDDEV_LATENCY: 120.040 (per CPU: 119.420 119.910 125.460 115.370 )
MIN_LATENCY: 46.500 (per CPU: 47.000 47.000 47.000 45.000 )
P50_LATENCY: 118.500 (per CPU: 118.000 119.000 118.000 119.000 )
P90_LATENCY: 127.500 (per CPU: 127.000 128.000 127.000 128.000 )
P99_LATENCY: 130.750 (per CPU: 131.000 131.000 129.000 132.000 )TRANSACTION_RATE: 32666.400 (per CPU: 8152.200 8169.842 8174.439 8169.897 )
Pod to remote pod with redirect_peer(), TCP_RR:
# percpu_netperf 10.217.1.33
RT_LATENCY: 44.449 (per CPU: 43.767 43.127 45.279 45.622 )
MEAN_LATENCY: 45.065 (per CPU: 44.030 45.530 45.190 45.510 )
STDDEV_LATENCY: 84.823 (per CPU: 66.770 97.290 84.380 90.850 )
MIN_LATENCY: 33.500 (per CPU: 33.000 33.000 34.000 34.000 )
P50_LATENCY: 43.250 (per CPU: 43.000 43.000 43.000 44.000 )
P90_LATENCY: 46.750 (per CPU: 46.000 47.000 47.000 47.000 )
P99_LATENCY: 52.750 (per CPU: 51.000 54.000 53.000 53.000 )TRANSACTION_RATE: 90039.500 (per CPU: 22848.186 23187.089 22085.077 21919.130 )
[0] https://linuxplumbersconf.org/event/7/contributions/674/attachments/568/1002/plumbers_2020_cilium_load_balancer.pdf
[1] https://github.com/borkmann/netperf_scripts/blob/master/percpu_netperf
--- drivers/net/veth.c | 9 ++++++ include/linux/netdevice.h | 4 +++ include/uapi/linux/bpf.h | 17 +++++++++++ net/core/dev.c | 15 ++++++++-- net/core/filter.c | 54 +++++++++++++++++++++++++++++----- tools/include/uapi/linux/bpf.h | 17 +++++++++++ 6 files changed, 106 insertions(+), 10 deletions(-)
drivers/net/veth.c +9 -0
@@ -420,6 +420,14 @@ static int veth_select_rxq(struct net_device *dev)return smp_processor_id () % dev->real_num_rx_queues; } +static struct net_device *veth_peer_dev (struct net_device *dev) +{ +struct veth_priv *priv =netdev_priv (dev); + +/* Callers must be under RCU read side. */ +return rcu_dereference (priv->peer); +} +static int veth_xdp_xmit (struct net_device *dev,int n,struct xdp_frame **frames,u32 flags,bool ndo_xmit)
@@ -1224,6 +1232,7 @@ static const struct net_device_ops veth_netdev_ops = { .ndo_set_rx_headroom = veth_set_rx_headroom, .ndo_bpf = veth_xdp, .ndo_xdp_xmit = veth_ndo_xdp_xmit, + .ndo_get_peer_dev = veth_peer_dev, };#define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HW_CSUM | \
include/linux/netdevice.h +4 -0
@@ -1277,6 +1277,9 @@ struct netdev_net_notifier {* int (*ndo_tunnel_ctl)(struct net_device *dev, struct ip_tunnel_parm *p, * int cmd); * Add, change, delete or get information on an IPv4 tunnel. +* struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); +* If a device is paired with a peer device, return the peer instance. +* The caller must be under RCU read context. */ struct net_device_ops {int (*ndo_init)(struct net_device *dev);
@@ -1484,6 +1487,7 @@ struct net_device_ops {struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev);int (*ndo_tunnel_ctl)(struct net_device *dev,struct ip_tunnel_parm *p,int cmd); +struct net_device * (*ndo_get_peer_dev)(struct net_device *dev); };/**
include/uapi/linux/bpf.h +17 -0
@@ -3719,6 +3719,22 @@ union bpf_attr {* never return NULL. * Return * A pointer pointing to the kernel percpu variable on this cpu. +* +* long bpf_redirect_peer(u32 ifindex, u64 flags) +* Description +* Redirect the packet to another net device of index *ifindex*. +* This helper is somewhat similar to **bpf_redirect**\ (), except +* that the redirection happens to the *ifindex*' peer device and +* the netns switch takes place from ingress to ingress without +* going through the CPU's backlog queue. +* +* The *flags* argument is reserved and must be 0. The helper is +* currently only supported for tc BPF program types at the ingress +* hook and for veth device types. The peer device must reside in a +* different network namespace. +* Return +* The helper returns **TC_ACT_REDIRECT** on success or +* **TC_ACT_SHOT** on error. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3876,6 +3892,7 @@ union bpf_attr {FN (redirect_neigh), \FN (bpf_per_cpu_ptr), \FN (bpf_this_cpu_ptr), \ +FN (redirect_peer), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
net/core/dev.c +12 -3
@@ -4930,7 +4930,7 @@ EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);static inline struct sk_buff *sch_handle_ingress (struct sk_buff *skb,struct packet_type **pt_prev,int *ret, -struct net_device *orig_dev) +struct net_device *orig_dev,bool *another) {#ifdef CONFIG_NET_CLS_ACT struct mini_Qdisc *miniq =rcu_dereference_bh (skb->dev->miniq_ingress);
@@ -4974,7 +4974,11 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,* redirecting to another netdev */ __skb_push (skb, skb->mac_len); -skb_do_redirect (skb); +if (skb_do_redirect (skb) == -EAGAIN ) { +__skb_pull (skb, skb->mac_len); + *another = true; +break ; + }return NULL ;case TC_ACT_CONSUMED :return NULL ;
@@ -5163,7 +5167,12 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, skip_taps:#ifdef CONFIG_NET_INGRESS if (static_branch_unlikely (&ingress_needed_key)) { - skb =sch_handle_ingress (skb, &pt_prev, &ret, orig_dev); +bool another = false; + + skb =sch_handle_ingress (skb, &pt_prev, &ret, orig_dev, + &another); +if (another) + goto another_round;if (!skb) goto out;
net/core/filter.c +47 -7
86 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +17 -0
@@ -3719,6 +3719,22 @@ union bpf_attr {* never return NULL. * Return * A pointer pointing to the kernel percpu variable on this cpu. +* +* long bpf_redirect_peer(u32 ifindex, u64 flags) +* Description +* Redirect the packet to another net device of index *ifindex*. +* This helper is somewhat similar to **bpf_redirect**\ (), except +* that the redirection happens to the *ifindex*' peer device and +* the netns switch takes place from ingress to ingress without +* going through the CPU's backlog queue. +* +* The *flags* argument is reserved and must be 0. The helper is +* currently only supported for tc BPF program types at the ingress +* hook and for veth device types. The peer device must reside in a +* different network namespace. +* Return +* The helper returns **TC_ACT_REDIRECT** on success or +* **TC_ACT_SHOT** on error. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -3876,6 +3892,7 @@ union bpf_attr {FN (redirect_neigh), \FN (bpf_per_cpu_ptr), \FN (bpf_this_cpu_ptr), \ +FN (redirect_peer), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v2 3/6 bpf: allow for map-in-map with dynamic inner array map entries
In reply to Daniel BorkmannRecent work in f4d05259213f ("bpf: Add map_meta_equal map ops") and 134fede4eecf ("bpf: Relax max_entries check for most of the inner map types") added support for dynamic inner max elements for most map-in-map types. Exceptions were maps like array or prog array where the map_gen_lookup() callback uses the maps' max_entries field as a constant when emitting instructions.
We recently implemented Maglev consistent hashing into Cilium's load balancer which uses map-in-map with an outer map being hash and inner being array holding the Maglev backend table for each service. This has been designed this way in order to reduce overall memory consumption given the outer hash map allows to avoid preallocating a large, flat memory area for all services. Also, the number of service mappings is not always known a-priori.
The use case for dynamic inner array map entries is to further reduce memory overhead, for example, some services might just have a small number of back ends while others could have a large number. Right now the Maglev backend table for small and large number of backends would need to have the same inner array map entries which adds a lot of unneeded overhead.
Dynamic inner array map entries can be realized by avoiding the inlined code generation for their lookup. The lookup will still be efficient since it will be calling into array_map_lookup_elem() directly and thus avoiding retpoline. The patch adds a BPF_F_NO_INLINE flag to map creation which internally swaps out map ops with a variant that does not have map_gen_lookup() callback and a relaxed map_meta_equal() that calls bpf_map_meta_equal() directly.
Example code generation where inner map is dynamic sized array:
# bpftool p d x i 125
int handle__sys_enter(void * ctx):
; int handle__sys_enter(void *ctx)
0: (b4) w1 = 0
; int key = 0;
1: (63) *(u32 *)(r10 -4) = r1
2: (bf) r2 = r10
;
3: (07) r2 += -4
; inner_map = bpf_map_lookup_elem(&outer_arr_dyn, &key);
4: (18) r1 = map[id:468]
6: (07) r1 += 272
7: (61) r0 = *(u32 *)(r2 +0)
8: (35) if r0 >= 0x3 goto pc+5
9: (67) r0 <<= 3
10: (0f) r0 += r1
11: (79) r0 = *(u64 *)(r0 +0)
12: (15) if r0 == 0x0 goto pc+1
13: (05) goto pc+1
14: (b7) r0 = 0
15: (b4) w6 = -1
; if (!inner_map)
16: (15) if r0 == 0x0 goto pc+6
17: (bf) r2 = r10
;
18: (07) r2 += -4
; val = bpf_map_lookup_elem(inner_map, &key);
19: (bf) r1 = r0 | No inlining but instead
20: (85) call array_map_lookup_elem#149280 | call to array_map_lookup_elem()
; return val ? *val : -1; | for inner array lookup.
21: (15) if r0 == 0x0 goto pc+1
; return val ? *val : -1;
22: (61) r6 = *(u32 *)(r0 +0)
; }
23: (bc) w0 = w6
24: (95) exit--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 5 +++++ kernel/bpf/arraymap.c | 40 ++++++++++++++++++++++++++++++++-- kernel/bpf/syscall.c | 3 ++- tools/include/uapi/linux/bpf.h | 5 +++++ 5 files changed, 51 insertions(+), 3 deletions(-)
include/linux/bpf.h +1 -0
@@ -54,6 +54,7 @@ struct bpf_iter_seq_info {struct bpf_map_ops {/* funcs callable from userspace (via syscall) */ int (*map_alloc_check)(union bpf_attr *attr); +const struct bpf_map_ops *(*map_swap_ops)(union bpf_attr *attr);struct bpf_map *(*map_alloc)(union bpf_attr *attr);void (*map_release)(struct bpf_map *map,struct file *map_file);void (*map_free)(struct bpf_map *map);
include/uapi/linux/bpf.h +5 -0
@@ -435,6 +435,11 @@ enum {/* Share perf_event among processes */ BPF_F_PRESERVE_ELEMS = (1U <<11 ), + +/* Do not inline (array) map lookups so the array map can be used for +* map in map with dynamic max entries. +*/ + BPF_F_NO_INLINE = (1U << 12), };/* Flags for BPF_PROG_QUERY. */
kernel/bpf/arraymap.c +38 -2
@@ -16,7 +16,7 @@#define ARRAY_CREATE_FLAG_MASK \ (BPF_F_NUMA_NODE | BPF_F_MMAPABLE | BPF_F_ACCESS_MASK | \ - BPF_F_PRESERVE_ELEMS) + BPF_F_PRESERVE_ELEMS | BPF_F_NO_INLINE)static void bpf_array_free_percpu (struct bpf_array *array) {
@@ -62,7 +62,7 @@ int array_map_alloc_check(union bpf_attr *attr)return -EINVAL ;if (attr->map_type !=BPF_MAP_TYPE_ARRAY && - attr->map_flags &BPF_F_MMAPABLE ) + attr->map_flags & (BPF_F_MMAPABLE |BPF_F_NO_INLINE ))return -EINVAL ; if (attr->map_type != BPF_MAP_TYPE_PERF_EVENT_ARRAY &&
@@ -78,6 +78,16 @@ int array_map_alloc_check(union bpf_attr *attr)return 0 ; } +const struct bpf_map_ops array_map_no_inline_ops; +const struct bpf_map_ops array_map_ops; + +static const struct bpf_map_ops *array_map_swap_ops (union bpf_attr *attr) +{ +return attr->map_flags &BPF_F_NO_INLINE ? + &array_map_no_inline_ops : + &array_map_ops; +} +static struct bpf_map *array_map_alloc (union bpf_attr *attr) {bool percpu = attr->map_type ==BPF_MAP_TYPE_PERCPU_ARRAY ;
@@ -639,6 +649,7 @@ static const struct bpf_iter_seq_info iter_seq_info = {static int array_map_btf_id;const struct bpf_map_ops array_map_ops = { .map_meta_equal = array_map_meta_equal, + .map_swap_ops = array_map_swap_ops, .map_alloc_check = array_map_alloc_check, .map_alloc = array_map_alloc, .map_free = array_map_free,
@@ -659,6 +670,31 @@ const struct bpf_map_ops array_map_ops = { .iter_seq_info = &iter_seq_info, }; +/* Variant which does not have map_gen_lookup() implementation, but +* therefore can relax map_meta_equal() check to allow for dynamic +* max_entries for inner maps. +*/ +const struct bpf_map_ops array_map_no_inline_ops = { + .map_meta_equal = bpf_map_meta_equal, + .map_alloc_check = array_map_alloc_check, + .map_alloc = array_map_alloc, + .map_free = array_map_free, + .map_get_next_key = array_map_get_next_key, + .map_lookup_elem = array_map_lookup_elem, + .map_update_elem = array_map_update_elem, + .map_delete_elem = array_map_delete_elem, + .map_direct_value_addr = array_map_direct_value_addr, + .map_direct_value_meta = array_map_direct_value_meta, + .map_mmap = array_map_mmap, + .map_seq_show_elem = array_map_seq_show_elem, + .map_check_btf = array_map_check_btf, + .map_lookup_batch = generic_map_lookup_batch, + .map_update_batch = generic_map_update_batch, + .map_btf_name ="bpf_array" , + .map_btf_id = &array_map_btf_id, + .iter_seq_info = &iter_seq_info, +}; +static int percpu_array_map_btf_id;const struct bpf_map_ops percpu_array_map_ops = { .map_meta_equal = bpf_map_meta_equal,
kernel/bpf/syscall.c +2 -1
@@ -111,7 +111,8 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) ops = bpf_map_types[type];if (!ops)return ERR_PTR (-EINVAL ); - +if (ops->map_swap_ops) + ops = ops->map_swap_ops (attr);if (ops->map_alloc_check) { err = ops->map_alloc_check (attr);if (err)
tools/include/uapi/linux/bpf.h +5 -0
@@ -435,6 +435,11 @@ enum {/* Share perf_event among processes */ BPF_F_PRESERVE_ELEMS = (1U <<11 ), + +/* Do not inline (array) map lookups so the array map can be used for +* map in map with dynamic max entries. +*/ + BPF_F_NO_INLINE = (1U << 12), };/* Flags for BPF_PROG_QUERY. */
Signature · 1 line
2.21.0
Re: [PATCH bpf-next v2 3/6] bpf: allow for map-in-map with dynamic inner array map entries
Quoted 76 lines · Daniel Borkmann
Recent work in
f4d05259213f("bpf: Addmap_meta_equalmap ops") and134fede4eecf("bpf: Relaxmax_entriescheck for most of the inner map types") added support for dynamic inner max elements for most map-in-map types. Exceptions were maps like array or prog array where themap_gen_lookup()callback uses the maps'max_entriesfield as a constant when emitting instructions.We recently implemented Maglev consistent hashing into Cilium's load balancer which uses map-in-map with an outer map being hash and inner being array holding the Maglev backend table for each service. This has been designed this way in order to reduce overall memory consumption given the outer hash map allows to avoid preallocating a large, flat memory area for all services. Also, the number of service mappings is not always known a-priori.
The use case for dynamic inner array map entries is to further reduce memory overhead, for example, some services might just have a small number of back ends while others could have a large number. Right now the Maglev backend table for small and large number of backends would need to have the same inner array map entries which adds a lot of unneeded overhead.
Dynamic inner array map entries can be realized by avoiding the inlined code generation for their lookup. The lookup will still be efficient since it will be calling into
array_map_lookup_elem()directly and thus avoiding retpoline. The patch adds aBPF_F_NO_INLINEflag to map creation which internally swaps out map ops with a variant that does not havemap_gen_lookup()callback and a relaxedmap_meta_equal()that callsbpf_map_meta_equal()directly.Example code generation where inner map is dynamic sized array:
# bpftool p d x i 125 int handle__sys_enter(void * ctx): ; int handle__sys_enter(void *ctx) 0: (b4) w1 = 0 ; int key = 0; 1: (63) *(u32 *)(r10 -4) = r1 2: (bf) r2 = r10 ; 3: (07) r2 += -4 ; inner_map = bpf_map_lookup_elem(&outer_arr_dyn, &key); 4: (18) r1 = map[id:468] 6: (07) r1 += 272 7: (61) r0 = *(u32 *)(r2 +0) 8: (35) if r0 >= 0x3 goto pc+5 9: (67) r0 <<= 3 10: (0f) r0 += r1 11: (79) r0 = *(u64 *)(r0 +0) 12: (15) if r0 == 0x0 goto pc+1 13: (05) goto pc+1 14: (b7) r0 = 0 15: (b4) w6 = -1 ; if (!inner_map) 16: (15) if r0 == 0x0 goto pc+6 17: (bf) r2 = r10 ; 18: (07) r2 += -4 ; val = bpf_map_lookup_elem(inner_map, &key); 19: (bf) r1 = r0 | No inlining but instead 20: (85) call array_map_lookup_elem#149280 | call to array_map_lookup_elem() ; return val ? *val : -1; | for inner array lookup. 21: (15) if r0 == 0x0 goto pc+1 ; return val ? *val : -1; 22: (61) r6 = *(u32 *)(r0 +0) ; } 23: (bc) w0 = w6 24: (95) exitSigned-off-by Daniel Borkmann <[email protected]>Acked-by Yonghong Song <[email protected]>--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 5 +++++ kernel/bpf/arraymap.c | 40 ++++++++++++++++++++++++++++++++-- kernel/bpf/syscall.c | 3 ++- tools/include/uapi/linux/bpf.h | 5 +++++ 5 files changed, 51 insertions(+), 3 deletions(-)
[...]
Quoted 34 lines
kernel/bpf/arraymap.c +25
-0+/* Variant which does not have map_gen_lookup() implementation, but +* therefore can relax map_meta_equal() check to allow for dynamic +* max_entries for inner maps. +*/ +const struct bpf_map_ops array_map_no_inline_ops = { + .map_meta_equal = bpf_map_meta_equal, + .map_alloc_check = array_map_alloc_check, + .map_alloc = array_map_alloc, + .map_free = array_map_free, + .map_get_next_key = array_map_get_next_key, + .map_lookup_elem = array_map_lookup_elem, + .map_update_elem = array_map_update_elem, + .map_delete_elem = array_map_delete_elem, + .map_direct_value_addr = array_map_direct_value_addr, + .map_direct_value_meta = array_map_direct_value_meta, + .map_mmap = array_map_mmap, + .map_seq_show_elem = array_map_seq_show_elem, + .map_check_btf = array_map_check_btf, + .map_lookup_batch = generic_map_lookup_batch, + .map_update_batch = generic_map_update_batch, + .map_btf_name ="bpf_array" , + .map_btf_id = &array_map_btf_id, + .iter_seq_info = &iter_seq_info, +}; +static int percpu_array_map_btf_id;const struct bpf_map_ops percpu_array_map_ops = { .map_meta_equal = bpf_map_meta_equal,kernel/bpf/syscall.c +0
-0
kernel/bpf/syscall.c static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) · line 115
Quoted 6 lines
kernel/bpf/syscall.c +2
-1@@ -111,7 +111,8 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) ops = bpf_map_types[type];if (!ops)return ERR_PTR (-EINVAL ); - +if (ops->map_swap_ops) + ops = ops->map_swap_ops (attr);
I'm afraid that this can cause quite a lot of confusion down the road.
Wouldn't designating -EOPNOTSUPP return code from map_gen_lookup() and not inlining in that case as if map_gen_lookup() wasn't even defined be a much smaller and more local (semantically) change that achieves exactly the same thing? Doesn't seem like switching from u32 to int for return value would be a big inconvenience for existing implementations of inlining callbacks, right?
Quoted 22 lines
kernel/bpf/syscall.c +0
-0if (ops->map_alloc_check) { err = ops->map_alloc_check (attr);if (err)tools/include/uapi/linux/bpf.h +5
-1@@ -435,6 +435,11 @@ enum {/* Share perf_event among processes */ BPF_F_PRESERVE_ELEMS = (1U <<11 ), + +/* Do not inline (array) map lookups so the array map can be used for +* map in map with dynamic max entries. +*/ + BPF_F_NO_INLINE = (1U << 12), };/* Flags for BPF_PROG_QUERY. */ --2.21.0
Daniel Borkmann
maintainerRe: [PATCH bpf-next v2 3/6] bpf: allow for map-in-map with dynamic inner array map entries
Quoted 1 line · Andrii Nakryiko
On Fri, Oct 9, 2020 at 7:13 AM Daniel Borkmann <[email protected]> wrote:
[...]
Quoted 17 lines
Quoted 8 lines
static int percpu_array_map_btf_id; const struct bpf_map_ops percpu_array_map_ops = { .map_meta_equal = bpf_map_meta_equal,kernel/bpf/syscall.c +0
-0kernel/bpf/syscall.c static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) · line 115
Quoted 6 lines
kernel/bpf/syscall.c +2
-1@@ -111,7 +111,8 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) ops = bpf_map_types[type];if (!ops)return ERR_PTR (-EINVAL ); - +if (ops->map_swap_ops) + ops = ops->map_swap_ops (attr);I'm afraid that this can cause quite a lot of confusion down the road.
Quoted 6 lines
Wouldn't designating
-EOPNOTSUPPreturn code frommap_gen_lookup()and not inlining in that case as ifmap_gen_lookup()wasn't even defined be a much smaller and more local (semantically) change that achieves exactly the same thing? Doesn't seem like switching from u32 to int for return value would be a big inconvenience for existing implementations of inlining callbacks, right?
I was originally thinking about it, but then decided not to take this path, for example the ops->map_gen_lookup() patching code has sanity checks for the u32 return code on whether we patched 0 or too many instructions, so if there is anything funky going on in one of the map_gen_lookup() that we'd get a negative code, for example, I don't want to just skip and not have the verifier bark loudly with "bpf verifier is misconfigured", also didn't want to make the logic inside fixup_bpf_calls() even more complex, so the patch here felt simpler & more straight forward to me.
Thanks,
Daniel
Re: [PATCH bpf-next v2 3/6] bpf: allow for map-in-map with dynamic inner array map entries
Quoted 28 lines · Daniel Borkmann
Quoted 1 line · Andrii Nakryiko
On Fri, Oct 9, 2020 at 7:13 AM Daniel Borkmann <[email protected]> wrote:
[...]
Quoted 17 lines
Quoted 8 lines
static int percpu_array_map_btf_id; const struct bpf_map_ops percpu_array_map_ops = { .map_meta_equal = bpf_map_meta_equal,kernel/bpf/syscall.c +0
-0kernel/bpf/syscall.c static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) · line 115
Quoted 6 lines
kernel/bpf/syscall.c +2
-1@@ -111,7 +111,8 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) ops = bpf_map_types[type];if (!ops)return ERR_PTR (-EINVAL ); - +if (ops->map_swap_ops) + ops = ops->map_swap_ops (attr);I'm afraid that this can cause quite a lot of confusion down the road.
Quoted 6 lines
Wouldn't designating
-EOPNOTSUPPreturn code frommap_gen_lookup()and not inlining in that case as ifmap_gen_lookup()wasn't even defined be a much smaller and more local (semantically) change that achieves exactly the same thing? Doesn't seem like switching from u32 to int for return value would be a big inconvenience for existing implementations of inlining callbacks, right?
Quoted 3 lines
I was originally thinking about it, but then decided not to take this path, for example the
ops->map_gen_lookup()patching code has sanity checks for the u32 return code on whether we patched 0 or too many instructions, so
Right, we won't ever need to patch >2 billion instructions, so making the return value int shouldn't be a problem. As for not catching accidental patched insn == -EOPNOTSUPP, I don't think that's a real concern, is it? All the other negative value would trigger loud error.
Quoted 5 lines
if there is anything funky going on in one of the
map_gen_lookup()that we'd get a negative code, for example, I don't want to just skip and not have the verifier bark loudly with "bpf verifier is misconfigured", also didn't want to make the logic insidefixup_bpf_calls()even more complex, so the patch here felt simpler & more straight forward to me.
It's not straightforward in the same way as class inheritance and overriding methods is not straightforward to follow in general. Swapping out entire sets of operations is super confusing, IMO.
Quoted 3 lines
Thanks,
Daniel
Daniel Borkmann
maintainerPATCH v2 4/6 bpf, selftests: add test for different array inner map size
In reply to Daniel BorkmannExtend the "diff_size" subtest to also include a non-inlined array map variant where dynamic inner #elems are possible.
--- .../selftests/bpf/prog_tests/btf_map_in_map.c | 39 ++++++++++++----- .../selftests/bpf/progs/test_btf_map_in_map.c | 43 +++++++++++++++++++ 2 files changed, 72 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c +29 -10
@@ -55,10 +55,10 @@ static int kern_sync_rcu(void)static void test_lookup_update (void ) { -int err, key =0 , val, i; +int map1_fd, map2_fd, map3_fd, map4_fd, map5_fd, map1_id, map2_id; +int outer_arr_fd, outer_hash_fd, outer_arr_dyn_fd;struct test_btf_map_in_map *skel; -int outer_arr_fd, outer_hash_fd; -int fd, map1_fd, map2_fd, map1_id, map2_id; +int err, key =0 , val, i, fd; skel =test_btf_map_in_map__open_and_load ();if (CHECK (!skel,"skel_open" ,"failed to open&load skeleton\n" ))
@@ -70,32 +70,45 @@ static void test_lookup_update(void) map1_fd =bpf_map__fd (skel->maps.inner_map1); map2_fd =bpf_map__fd (skel->maps.inner_map2); + map3_fd =bpf_map__fd (skel->maps.inner_map3); + map4_fd =bpf_map__fd (skel->maps.inner_map4); + map5_fd =bpf_map__fd (skel->maps.inner_map5); + outer_arr_dyn_fd =bpf_map__fd (skel->maps.outer_arr_dyn); outer_arr_fd =bpf_map__fd (skel->maps.outer_arr); outer_hash_fd =bpf_map__fd (skel->maps.outer_hash); -/* inner1 = input, inner2 = input + 1 */ - map1_fd =bpf_map__fd (skel->maps.inner_map1); +/* inner1 = input, inner2 = input + 1, inner3 = input + 2 */ bpf_map_update_elem (outer_arr_fd, &key, &map1_fd,0 ); - map2_fd =bpf_map__fd (skel->maps.inner_map2);bpf_map_update_elem (outer_hash_fd, &key, &map2_fd,0 ); +bpf_map_update_elem (outer_arr_dyn_fd, &key, &map3_fd,0 ); skel->bss->input =1 ;usleep (1 ); -bpf_map_lookup_elem (map1_fd, &key, &val);CHECK (val !=1 ,"inner1" ,"got %d != exp %d\n" , val,1 );bpf_map_lookup_elem (map2_fd, &key, &val);CHECK (val !=2 ,"inner2" ,"got %d != exp %d\n" , val,2 ); +bpf_map_lookup_elem (map3_fd, &key, &val); +CHECK (val !=3 ,"inner3" ,"got %d != exp %d\n" , val,3 ); -/* inner1 = input + 1, inner2 = input */ +/* inner2 = input, inner1 = input + 1, inner4 = input + 2 */ bpf_map_update_elem (outer_arr_fd, &key, &map2_fd,0 );bpf_map_update_elem (outer_hash_fd, &key, &map1_fd,0 ); +bpf_map_update_elem (outer_arr_dyn_fd, &key, &map4_fd,0 ); skel->bss->input =3 ;usleep (1 ); -bpf_map_lookup_elem (map1_fd, &key, &val);CHECK (val !=4 ,"inner1" ,"got %d != exp %d\n" , val,4 );bpf_map_lookup_elem (map2_fd, &key, &val);CHECK (val !=3 ,"inner2" ,"got %d != exp %d\n" , val,3 ); +bpf_map_lookup_elem (map4_fd, &key, &val); +CHECK (val !=5 ,"inner4" ,"got %d != exp %d\n" , val,5 ); + +/* inner5 = input + 2 */ +bpf_map_update_elem (outer_arr_dyn_fd, &key, &map5_fd,0 ); + skel->bss->input =5 ; +usleep (1 ); +bpf_map_lookup_elem (map5_fd, &key, &val); +CHECK (val !=7 ,"inner5" ,"got %d != exp %d\n" , val,7 );for (i =0 ; i <5 ; i++) { val = i %2 ? map1_fd : map2_fd;
@@ -106,7 +119,13 @@ static void test_lookup_update(void) } err =bpf_map_update_elem (outer_arr_fd, &key, &val,0 );if (CHECK_FAIL (err)) { -printf ("failed to update hash_of_maps on iter #%d\n" , i); +printf ("failed to update array_of_maps on iter #%d\n" , i); + goto cleanup; + } + val = i %2 ? map4_fd : map5_fd; + err =bpf_map_update_elem (outer_arr_dyn_fd, &key, &val,0 ); +if (CHECK_FAIL (err)) { +printf ("failed to update array_of_maps (dyn) on iter #%d\n" , i); goto cleanup; } }
tools/testing/selftests/bpf/progs/test_btf_map_in_map.c +43 -0
55 lines not on this page · raw message
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v2 5/6 bpf, selftests: make redirect_neigh test more extensible
In reply to Daniel BorkmannRename into test_tc_redirect.sh and move setup and test code into separate functions so they can be reused for newly added tests in here. Also remove the crude hack to override ifindex inside the object file via xxd and sed and just use a simple map instead. Map given iproute2 does not support BTF fully and therefore neither global data at this point.
--- .../selftests/bpf/progs/test_tc_neigh.c | 40 ++-- tools/testing/selftests/bpf/test_tc_neigh.sh | 168 --------------- .../testing/selftests/bpf/test_tc_redirect.sh | 197 ++++++++++++++++++ 3 files changed, 219 insertions(+), 186 deletions(-) delete mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh create mode 100755 tools/testing/selftests/bpf/test_tc_redirect.sh
tools/testing/selftests/bpf/progs/test_tc_neigh.c +22 -18
@@ -13,17 +13,10 @@#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 */
@@ -39,6 +32,18 @@ a.s6_addr32[3] == b.s6_addr32[3])#endif +enum { + dev_src, + dev_dst, +}; + +struct bpf_map_def SEC("maps") ifindex_map = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(int), + .value_size = sizeof(int), + .max_entries = 2, +}; + static __always_inline bool is_remote_ep_v4(struct __sk_buff *skb,__be32 addr) {
@@ -73,7 +78,14 @@ static __always_inline bool is_remote_ep_v6(struct __sk_buff *skb,return v6_equal (ip6h->daddr, addr); } -SEC("chk_neigh") int tc_chk(struct __sk_buff *skb) +static __always_inline int get_dev_ifindex(int which) +{ +int *ifindex =bpf_map_lookup_elem (&ifindex_map, &which); + +return ifindex ? *ifindex :0 ; +} + +SEC("chk_egress") int tc_chk(struct __sk_buff *skb) {void *data_end =ctx_ptr (skb->data_end);void *data =ctx_ptr (skb->data);
@@ -87,7 +99,6 @@ SEC("chk_neigh") int tc_chk(struct __sk_buff *skb) SEC("dst_ingress") int tc_dst(struct __sk_buff *skb) { -int idx = dst_to_src_tmp;__u8 zero[ETH_ALEN *2 ];bool redirect = false;
@@ -103,19 +114,15 @@ SEC("dst_ingress") int tc_dst(struct __sk_buff *skb)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 ); +return bpf_redirect_neigh (get_dev_ifindex (dev_src),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;
@@ -131,14 +138,11 @@ SEC("src_ingress") int tc_src(struct __sk_buff *skb)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 ); +return bpf_redirect_neigh (get_dev_ifindex (dev_dst),0 ); } char __license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_tc_neigh.sh deleted +0 -168
168 lines not on this page · raw message
tools/testing/selftests/bpf/test_tc_redirect.sh new file +197 -0
197 lines not on this page · raw message
Signature · 1 line
2.21.0
Daniel Borkmann
maintainerPATCH v2 6/6 bpf, selftests: add redirect_peer selftest
In reply to Daniel BorkmannExtend the test_tc_redirect test and add a small test that exercises the new redirect_peer() helper for the IPv4 and IPv6 case.
--- .../selftests/bpf/progs/test_tc_peer.c | 45 +++++++++++++++++++ .../testing/selftests/bpf/test_tc_redirect.sh | 25 +++++++---- 2 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_tc_peer.c
tools/testing/selftests/bpf/progs/test_tc_peer.c new file +45 -0
@@ -0,0 +1,45 @@ +// 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 <bpf/bpf_helpers.h> + +enum { + dev_src, + dev_dst, +}; + +struct bpf_map_def SEC("maps") ifindex_map = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(int), + .value_size = sizeof(int), + .max_entries = 2, +}; + +static __always_inline int get_dev_ifindex(int which) +{ +int *ifindex =bpf_map_lookup_elem (&ifindex_map, &which); + +return ifindex ? *ifindex :0 ; +} + +SEC("chk_egress") int tc_chk(struct __sk_buff *skb) +{ +return TC_ACT_SHOT ; +} + +SEC("dst_ingress") int tc_dst(struct __sk_buff *skb) +{ +return bpf_redirect_peer (get_dev_ifindex (dev_src),0 ); +} + +SEC("src_ingress") int tc_src(struct __sk_buff *skb) +{ +return bpf_redirect_peer (get_dev_ifindex (dev_dst),0 ); +} + +char __license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/test_tc_redirect.sh +16 -9
@@ -4,9 +4,10 @@ # This test sets up 3 netns (src <-> fwd <-> dst). There is no direct veth link # between src and dst. The netns fwd has veth links to each src and dst. The # client is in src and server in dst. The test installs a TC BPF program to each -# host facing veth in fwd which calls into bpf_redirect_peer() to perform the -# neigh addr population and redirect; it also installs a dropper prog on the -# egress side to drop skbs if neigh addrs were not populated. +# host facing veth in fwd which calls into i) bpf_redirect_neigh() to perform the +# neigh addr population and redirect or ii) bpf_redirect_peer() for namespace +# switch from ingress side; it also installs a checker prog on the egress side +# to drop unexpected traffic. if [[ $EUID -ne 0 ]]; then echo "This script must be run as root"
@@ -166,15 +167,17 @@ hex_mem_str() perl -e 'print join(" ", unpack("(H2)8", pack("L", @ARGV)))' $1 } -netns_setup_neigh() +netns_setup_bpf() { + local obj=$1 + ip netns exec ${NS_FWD} tc qdisc add dev veth_src_fwd clsact - ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd ingress bpf da obj test_tc_neigh.o sec src_ingress - ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd egress bpf da obj test_tc_neigh.o sec chk_egress + ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd ingress bpf da obj $obj sec src_ingress + ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd egress bpf da obj $obj sec chk_egress ip netns exec ${NS_FWD} tc qdisc add dev veth_dst_fwd clsact - ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd ingress bpf da obj test_tc_neigh.o sec dst_ingress - ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd egress bpf da obj test_tc_neigh.o sec chk_egress + ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd ingress bpf da obj $obj sec dst_ingress + ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd egress bpf da obj $obj sec chk_egress veth_src=$(ip netns exec ${NS_FWD} cat /sys/class/net/veth_src_fwd/ifindex) veth_dst=$(ip netns exec ${NS_FWD} cat /sys/class/net/veth_dst_fwd/ifindex)
@@ -193,5 +196,9 @@ trap netns_cleanup EXIT set -e netns_setup -netns_setup_neigh +netns_setup_bpf test_tc_neigh.o +netns_test_connectivity +netns_cleanup +netns_setup +netns_setup_bpf test_tc_peer.o netns_test_connectivity
Signature · 1 line
2.21.0