libbpf: fix reuse of DEVMAP
Subsystems (4)
v3 cover libbpf: fix reuse of DEVMAP
changes in v3:
- instead of setting BPF_F_RDONLY_PROG on both sides, just clear BPF_F_RDONLY_PROG in map_info.map_flags as suggested by Andrii Nakryiko
- in the test, use ASSERT_* instead of CHECK
- shorten the test by using open_and_load from the skel
- in the test, drop NULL check before unloading/destroying bpf objs
- start the commit messages with "libbpf" and "selftests/bpf" respectively instead of just "bpf"
changes in v2:
- preserve compatibility with older kernels
- add a basic selftest covering the re-use of DEVMAP maps
Yureka Lilian (2):
libbpf: fix reuse of DEVMAP
selftests/bpf: add test for DEVMAP reuse
tools/lib/bpf/libbpf.c | 11 ++++ .../bpf/prog_tests/pinning_devmap_reuse.c | 50 +++++++++++++++++++ .../selftests/bpf/progs/test_pinning_devmap.c | 20 ++++++++ 3 files changed, 81 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c create mode 100644 tools/testing/selftests/bpf/progs/test_pinning_devmap.c
Signature · 1 line
2.50.1
PATCH v3 1/2 libbpf: fix reuse of DEVMAP
Previously, re-using pinned DEVMAP maps would always fail, because get_map_info on a DEVMAP always returns flags with BPF_F_RDONLY_PROG set, but BPF_F_RDONLY_PROG being set on a map during creation is invalid.
Thus, ignore the BPF_F_RDONLY_PROG flag in the flags returned from get_map_info when checking for compatibility with an existing DEVMAP.
The same problem is handled in a third-party ebpf library:
- https://github.com/cilium/ebpf/issues/925
- https://github.com/cilium/ebpf/pull/930
--- tools/lib/bpf/libbpf.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/lib/bpf/libbpf.c +11 -0
@@ -5088,6 +5088,17 @@ static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd)return false; } +/* get_map_info on a DEVMAP will always return flags with +* BPF_F_RDONLY_PROG set, but it will never be set on a map +* being created. +* Thus, ignore the BPF_F_RDONLY_PROG flag in the flags +* returned from get_map_info when checking for compatibility +* with an existing DEVMAP. +*/ +if (map->def.type ==BPF_MAP_TYPE_DEVMAP || map->def.type ==BPF_MAP_TYPE_DEVMAP_HASH ) { + map_info.map_flags &= ~BPF_F_RDONLY_PROG ; + } + return (map_info.type == map->def.type && map_info.key_size == map->def.key_size && map_info.value_size == map->def.value_size &&
Signature · 1 line
2.50.1
PATCH v3 2/2 selftests/bpf: add test for DEVMAP reuse
In reply to Yureka LilianThe test covers basic re-use of a pinned DEVMAP map, with both matching and mismatching parameters.
--- .../bpf/prog_tests/pinning_devmap_reuse.c | 50 +++++++++++++++++++ .../selftests/bpf/progs/test_pinning_devmap.c | 20 ++++++++ 2 files changed, 70 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c create mode 100644 tools/testing/selftests/bpf/progs/test_pinning_devmap.c
tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c new file +50 -0
@@ -0,0 +1,50 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <test_progs.h> + + +#include "test_pinning_devmap.skel.h" + +void test_pinning_devmap_reuse (void ) +{ +const char *pinpath1 ="/sys/fs/bpf/pinmap1" ; +const char *pinpath2 ="/sys/fs/bpf/pinmap2" ; +struct test_pinning_devmap *skel1 =NULL , *skel2 =NULL ; +int err; +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts); + +/* load the object a first time */ + skel1 =test_pinning_devmap__open_and_load (); +if (!ASSERT_OK_PTR (skel1,"skel_load1" )) + goto out; + +/* load the object a second time, re-using the pinned map */ + skel2 =test_pinning_devmap__open_and_load (); +if (!ASSERT_OK_PTR (skel2,"skel_load2" )) + goto out; + +/* we can close the reference safely without +* the map's refcount falling to 0 +*/ +test_pinning_devmap__destroy (skel1); + skel1 =NULL ; + +/* now, swap the pins */ + err =renameat2 (0 , pinpath1,0 , pinpath2,RENAME_EXCHANGE ); +if (!ASSERT_OK (err,"swap pins" )) + goto out; + +/* load the object again, this time the re-use should fail */ + skel1 =test_pinning_devmap__open_and_load (); +if (!ASSERT_ERR_PTR (skel1,"skel_load3" )) + goto out; + +out: +unlink (pinpath1); +unlink (pinpath2); +test_pinning_devmap__destroy (skel1); +test_pinning_devmap__destroy (skel2); +}
tools/testing/selftests/bpf/progs/test_pinning_devmap.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_DEVMAP); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u32); + __uint(pinning, LIBBPF_PIN_BY_NAME); +} pinmap1 SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_DEVMAP); + __uint(max_entries, 2); + __type(key, __u32); + __type(value, __u32); + __uint(pinning, LIBBPF_PIN_BY_NAME); +} pinmap2 SEC(".maps");
Signature · 1 line
2.50.1
Re: [PATCH v3 2/2] selftests/bpf: add test for DEVMAP reuse
Quoted 5 lines · Yureka Lilian
The test covers basic re-use of a pinned DEVMAP map, with both matching and mismatching parameters.
Signed-off-by Yureka Lilian <[email protected]>---
[...]
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 11 lines · On Thu, 14 Aug 2025 20:01:11 +0200 you wrote:
changes in v3:
- instead of setting
BPF_F_RDONLY_PROGon both sides, just clearBPF_F_RDONLY_PROGin map_info.map_flags as suggested by Andrii Nakryiko- in the test, use ASSERT_* instead of CHECK
- shorten the test by usingopen_and_loadfrom the skel
- in the test, drop NULL check before unloading/destroying bpf objs[...]
Here is the summary with links:
- [v3,1/2] libbpf: fix reuse of DEVMAP
(no matching commit)
- [v3,2/2] selftests/bpf: add test for DEVMAP reuse
https://git.kernel.org/bpf/bpf-next/c/7f8fa9d370c1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html