diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2021-10-20 18:44:04 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-10-21 17:10:11 -0700 |
| commit | 4f2511e1990985103929ab799fb3ebca81969b77 (patch) | |
| tree | 788f588b995b81fe8bcc9c639fefc8b6f866a379 /tools/testing/selftests/bpf/prog_tests/global_data.c | |
| parent | 26071635ac5ecd8276bf3bdfc3ea1128c93ac722 (diff) | |
| download | linux-4f2511e1990985103929ab799fb3ebca81969b77.tar.bz2 | |
selftests/bpf: Switch to ".bss"/".rodata"/".data" lookups for internal maps
Utilize libbpf's feature of allowing to lookup internal maps by their
ELF section names. No need to guess or calculate the exact truncated
prefix taken from the object name.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20211021014404.2635234-11-andrii@kernel.org
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/global_data.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/global_data.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/global_data.c b/tools/testing/selftests/bpf/prog_tests/global_data.c index 9efa7e50eab2..afd8639f9a94 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data.c @@ -103,11 +103,18 @@ static void test_global_data_struct(struct bpf_object *obj, __u32 duration) static void test_global_data_rdonly(struct bpf_object *obj, __u32 duration) { int err = -ENOMEM, map_fd, zero = 0; - struct bpf_map *map; + struct bpf_map *map, *map2; __u8 *buff; map = bpf_object__find_map_by_name(obj, "test_glo.rodata"); - if (CHECK_FAIL(!map || !bpf_map__is_internal(map))) + if (!ASSERT_OK_PTR(map, "map")) + return; + if (!ASSERT_TRUE(bpf_map__is_internal(map), "is_internal")) + return; + + /* ensure we can lookup internal maps by their ELF names */ + map2 = bpf_object__find_map_by_name(obj, ".rodata"); + if (!ASSERT_EQ(map, map2, "same_maps")) return; map_fd = bpf_map__fd(map); |