Skip to content

Commit 8a19edd

Browse files
olsajirianakryiko
authored andcommitted
selftests/bpf: Fix kprobe_multi_test/attach_override test
We need to deny the attach_override test for arm64, denying the whole kprobe_multi_test suite. Also making attach_override static. Fixes: 7182e56 ("selftests/bpf: Add kprobe_multi override test") Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20230913114711.499829-1-jolsa@kernel.org
1 parent 214bfd2 commit 8a19edd

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

tools/testing/selftests/bpf/DENYLIST.aarch64

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
bpf_cookie/multi_kprobe_attach_api # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
22
bpf_cookie/multi_kprobe_link_api # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
33
fexit_sleep # The test never returns. The remaining tests cannot start.
4-
kprobe_multi_bench_attach # bpf_program__attach_kprobe_multi_opts unexpected error: -95
5-
kprobe_multi_test/attach_api_addrs # bpf_program__attach_kprobe_multi_opts unexpected error: -95
6-
kprobe_multi_test/attach_api_pattern # bpf_program__attach_kprobe_multi_opts unexpected error: -95
7-
kprobe_multi_test/attach_api_syms # bpf_program__attach_kprobe_multi_opts unexpected error: -95
8-
kprobe_multi_test/bench_attach # bpf_program__attach_kprobe_multi_opts unexpected error: -95
9-
kprobe_multi_test/link_api_addrs # link_fd unexpected link_fd: actual -95 < expected 0
10-
kprobe_multi_test/link_api_syms # link_fd unexpected link_fd: actual -95 < expected 0
11-
kprobe_multi_test/skel_api # libbpf: failed to load BPF skeleton 'kprobe_multi': -3
4+
kprobe_multi_bench_attach # needs CONFIG_FPROBE
5+
kprobe_multi_test # needs CONFIG_FPROBE
126
module_attach # prog 'kprobe_multi': failed to auto-attach: -95
137
fentry_test/fentry_many_args # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
148
fexit_test/fexit_many_args # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524

tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)
454454
}
455455
}
456456

457-
void test_attach_override(void)
457+
static void test_attach_override(void)
458458
{
459459
struct kprobe_multi_override *skel = NULL;
460460
struct bpf_link *link = NULL;

0 commit comments

Comments
 (0)