diff options
| author | Martin KaFai Lau <kafai@fb.com> | 2020-08-27 18:18:13 -0700 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-08-28 15:41:30 +0200 |
| commit | 134fede4eecfcbe7900e789f625fa6f9c3a8cd0e (patch) | |
| tree | ac0ff7502836e57adf3e1d442dd6814a08e5a8b4 /net/xdp | |
| parent | f4d05259213ff1e91f767c91dcab455f68308fac (diff) | |
| download | lwn-134fede4eecfcbe7900e789f625fa6f9c3a8cd0e.tar.gz lwn-134fede4eecfcbe7900e789f625fa6f9c3a8cd0e.zip | |
bpf: Relax max_entries check for most of the inner map types
Most of the maps do not use max_entries during verification time.
Thus, those map_meta_equal() do not need to enforce max_entries
when it is inserted as an inner map during runtime. The max_entries
check is removed from the default implementation bpf_map_meta_equal().
The prog_array_map and xsk_map are exception. Its map_gen_lookup
uses max_entries to generate inline lookup code. Thus, they will
implement its own map_meta_equal() to enforce max_entries.
Since there are only two cases now, the max_entries check
is not refactored and stays in its own .c file.
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200828011813.1970516-1-kafai@fb.com
Diffstat (limited to 'net/xdp')
| -rw-r--r-- | net/xdp/xskmap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c index f45f29f04151..2a4fd6677155 100644 --- a/net/xdp/xskmap.c +++ b/net/xdp/xskmap.c @@ -254,9 +254,16 @@ void xsk_map_try_sock_delete(struct xsk_map *map, struct xdp_sock *xs, spin_unlock_bh(&map->lock); } +static bool xsk_map_meta_equal(const struct bpf_map *meta0, + const struct bpf_map *meta1) +{ + return meta0->max_entries == meta1->max_entries && + bpf_map_meta_equal(meta0, meta1); +} + static int xsk_map_btf_id; const struct bpf_map_ops xsk_map_ops = { - .map_meta_equal = bpf_map_meta_equal, + .map_meta_equal = xsk_map_meta_equal, .map_alloc = xsk_map_alloc, .map_free = xsk_map_free, .map_get_next_key = xsk_map_get_next_key, |