Skip to contentSkip to conversation

selftests/bpf: Fix kprobe_multi_test/attach_override test

PATCH Superseded Jiri Olsa 4 participants 4 messages Sep 12, 2023

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/1 selftests/bpf: Fix kprobe_multi_test/attach_override test

We need to deny the attach_override test for arm64 and make it static.

Fixes 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/DENYLIST.aarch64               | 1 +
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -0
index 7f768d335698..b32f962dee92 100644
@@ -9,6 +9,7 @@ kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_mu
 kprobe_multi_test/link_api_addrs                 # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/link_api_syms                  # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/skel_api                       # libbpf: failed to load BPF skeleton 'kprobe_multi': -3
+kprobe_multi_test/attach_override                # test_attach_override:FAIL:kprobe_multi_empty__open_and_load unexpected error: -22
 module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
 fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
 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 +1 -1
index e05477b210a5..4041cfa670eb 100644
@@ -454,7 +454,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)
 	}
 }
 
-void test_attach_override(void)
+static void test_attach_override(void)
 {
 	struct kprobe_multi_override *skel = NULL;
 	struct bpf_link *link = NULL;
Signature · 1 line
2.41.0
#1 lore raw
Quoted 16 lines · Jiri Olsa

We need to deny the attach_override test for arm64 and make it static.

Fixes 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/DENYLIST.aarch64               | 1 +
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -0
index 7f768d335698..b32f962dee92 100644

tools/testing/selftests/bpf/DENYLIST.aarch64 kprobe_multi_test/bench_attach # bpf_program__attach_kprobe_mu · line 12

Quoted 4 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -0
@@ -9,6 +9,7 @@ kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_mu
 kprobe_multi_test/link_api_addrs                 # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/link_api_syms                  # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/skel_api                       # libbpf: failed to load BPF skeleton 'kprobe_multi': -3
+kprobe_multi_test/attach_override                # test_attach_override:FAIL:kprobe_multi_empty__open_and_load unexpected error: -22

why do we need this ?
Andrii, move of kconfig override into common should fix it, no?

Quoted 19 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -0
 module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
 fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
 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 +1 -2
index e05477b210a5..4041cfa670eb 100644
@@ -454,7 +454,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)
        }
 }
 
-void test_attach_override(void)
+static void test_attach_override(void)
 {
        struct kprobe_multi_override *skel = NULL;
        struct bpf_link *link = NULL;
--

2.41.0

#2 lore raw
Quoted 13 lines · Alexei Starovoitov
Quoted 11 lines · Jiri Olsa

We need to deny the attach_override test for arm64 and make it static.

Fixes 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/DENYLIST.aarch64               | 1 +
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Quoted 12 lines

tools/testing/selftests/bpf/DENYLIST.aarch64 kprobe_multi_test/bench_attach # bpf_program__attach_kprobe_mu · line 12

Quoted 9 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -0
index 7f768d335698..b32f962dee92 100644
@@ -9,6 +9,7 @@ kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_mu
 kprobe_multi_test/link_api_addrs                 # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/link_api_syms                  # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/skel_api                       # libbpf: failed to load BPF skeleton 'kprobe_multi': -3
+kprobe_multi_test/attach_override                # test_attach_override:FAIL:kprobe_multi_empty__open_and_load unexpected error: -22

why do we need this ?
Andrii, move of kconfig override into common should fix it, no?

So my patch did indeed enable BPF_KPROBE_OVERRIDE=y on aarch64, but we are now encountering "not supported" error somewhere:

test_attach_override:PASS:kprobe_multi_empty__open_and_load 0 nsec
libbpf: prog 'test_override': failed to attach: Operation not supported test_attach_override:PASS:override_attached_bpf_fentry_test1 0 nsec
libbpf: prog 'test_override': failed to attach: Operation not supported test_attach_override:FAIL:override_attached_should_fail_bio unexpected
error: -95

retsnoop should be able to point out where this is coming from, but unfortunately I don't have aarch64 setup that allows me to run VMs (at least not yet). So if Jiri has access to arm64 machine, please take a look meanwhile.

We need to understand if bpf_override_return() never worked, or Jiri's change with addrs_check_error_injection_list added breaks something. And then act accordingly (either denylist the test, or fix the bug).

Quoted 20 lines
Quoted 20 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -0
 module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
 fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
 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 +1 -2
index e05477b210a5..4041cfa670eb 100644
@@ -454,7 +454,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)
        }
 }
 
-void test_attach_override(void)
+static void test_attach_override(void)
 {
        struct kprobe_multi_override *skel = NULL;
        struct bpf_link *link = NULL;
--

2.41.0

#3 lore raw
In reply to Alexei Starovoitov
Quoted 12 lines · Alexei Starovoitov
Quoted 11 lines · Jiri Olsa

We need to deny the attach_override test for arm64 and make it static.

Fixes 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/DENYLIST.aarch64               | 1 +
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Quoted 12 lines

tools/testing/selftests/bpf/DENYLIST.aarch64 kprobe_multi_test/bench_attach # bpf_program__attach_kprobe_mu · line 12

Quoted 9 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -0
index 7f768d335698..b32f962dee92 100644
@@ -9,6 +9,7 @@ kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_mu
 kprobe_multi_test/link_api_addrs                 # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/link_api_syms                  # link_fd unexpected link_fd: actual -95 < expected 0
 kprobe_multi_test/skel_api                       # libbpf: failed to load BPF skeleton 'kprobe_multi': -3
+kprobe_multi_test/attach_override                # test_attach_override:FAIL:kprobe_multi_empty__open_and_load unexpected error: -22

why do we need this ?
Andrii, move of kconfig override into common should fix it, no?

the test creates kprobe_multi link, so it needs fprobe, which is still not enabled in arm

but I miread the error.. there's some other issue with override helper on arm

also the missing static fix is needed

jirka

Quoted 20 lines
Quoted 20 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -0
 module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
 fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524
 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 +1 -2
index e05477b210a5..4041cfa670eb 100644
@@ -454,7 +454,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)
        }
 }
 
-void test_attach_override(void)
+static void test_attach_override(void)
 {
        struct kprobe_multi_override *skel = NULL;
        struct bpf_link *link = NULL;
--

2.41.0