iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftest/bpf: Switch recursion test to use htab_map_delete_elem

Browse Source 
Currently the recursion test is hooking __htab_map_lookup_elem
function, which is invoked both from bpf_prog and bpf syscall.

But in our kernel build, the __htab_map_lookup_elem gets inlined
within the htab_map_lookup_elem, so it's not trigered and the
test fails.

Fixing this by using htab_map_delete_elem, which is not inlined
for bpf_prog calls (like htab_map_lookup_elem is) and is used
directly as pointer for map_delete_elem, so it won't disappear
by inlining.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/YVnfFTL/3T6jOwHI@krava
This commit is contained in:
Jiri Olsa
2021-10-03 18:49:25 +02:00
committed by Andrii Nakryiko
parent 929bef4677
commit 189c83bdde
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/testing/selftests/bpf/prog_tests/recursion.c
View File

@ -20,18 +20,18 @@ void test_recursion(void)
goto out; goto out;
ASSERT_EQ(skel->bss->pass1, 0, "pass1 == 0"); ASSERT_EQ(skel->bss->pass1, 0, "pass1 == 0");
bpf_map_lookup_elem(bpf_map__fd(skel->maps.hash1), &key, 0); bpf_map_delete_elem(bpf_map__fd(skel->maps.hash1), &key);
ASSERT_EQ(skel->bss->pass1, 1, "pass1 == 1"); ASSERT_EQ(skel->bss->pass1, 1, "pass1 == 1");
bpf_map_lookup_elem(bpf_map__fd(skel->maps.hash1), &key, 0); bpf_map_delete_elem(bpf_map__fd(skel->maps.hash1), &key);
ASSERT_EQ(skel->bss->pass1, 2, "pass1 == 2"); ASSERT_EQ(skel->bss->pass1, 2, "pass1 == 2");
ASSERT_EQ(skel->bss->pass2, 0, "pass2 == 0"); ASSERT_EQ(skel->bss->pass2, 0, "pass2 == 0");
bpf_map_lookup_elem(bpf_map__fd(skel->maps.hash2), &key, 0); bpf_map_delete_elem(bpf_map__fd(skel->maps.hash2), &key);
ASSERT_EQ(skel->bss->pass2, 1, "pass2 == 1"); ASSERT_EQ(skel->bss->pass2, 1, "pass2 == 1");
bpf_map_lookup_elem(bpf_map__fd(skel->maps.hash2), &key, 0); bpf_map_delete_elem(bpf_map__fd(skel->maps.hash2), &key);
ASSERT_EQ(skel->bss->pass2, 2, "pass2 == 2"); ASSERT_EQ(skel->bss->pass2, 2, "pass2 == 2");
err = bpf_obj_get_info_by_fd(bpf_program__fd(skel->progs.on_lookup), err = bpf_obj_get_info_by_fd(bpf_program__fd(skel->progs.on_delete),
&prog_info, &prog_info_len); &prog_info, &prog_info_len);
if (!ASSERT_OK(err, "get_prog_info")) if (!ASSERT_OK(err, "get_prog_info"))
goto out; goto out;

9
tools/testing/selftests/bpf/progs/recursion.c
View File

@ -24,8 +24,8 @@ struct {
int pass1 = 0; int pass1 = 0;
int pass2 = 0; int pass2 = 0;
SEC("fentry/__htab_map_lookup_elem") SEC("fentry/htab_map_delete_elem")
int BPF_PROG(on_lookup, struct bpf_map *map) int BPF_PROG(on_delete, struct bpf_map *map)
{ {
int key = 0; int key = 0;
@ -35,10 +35,7 @@ int BPF_PROG(on_lookup, struct bpf_map *map)
} }
if (map == (void *)&hash2) { if (map == (void *)&hash2) {
pass2++; pass2++;
/* htab_map_gen_lookup() will inline below call bpf_map_delete_elem(&hash2, &key);
* into direct call to __htab_map_lookup_elem()
*/
bpf_map_lookup_elem(&hash2, &key);
return 0; return 0;
} }