Skip to contentSkip to conversation

selftests/bpf: Fix kprobe_multi_test/attach_override test

PATCH Applied Jiri Olsa 4 participants 4 messages Sep 13, 2023 – Sep 14, 2023

Subsystems (3)
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH v2 1/1 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 7182e56411b9 ("selftests/bpf: Add kprobe_multi override test")
---
 tools/testing/selftests/bpf/DENYLIST.aarch64             | 9 +--------
 .../testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

v2 changes:
- rebased on latest bpf/master, used just kprobe_multi_test suite name in DENYLIST.aarch64 to cover all kprobe_multi tests

tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -8
index 7f768d335698..b733ce16c0f8 100644
@@ -1,14 +1,7 @@
 bpf_cookie/multi_kprobe_attach_api               # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 bpf_cookie/multi_kprobe_link_api                 # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 fexit_sleep                                      # The test never returns. The remaining tests cannot start.
-kprobe_multi_bench_attach                        # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_addrs               # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_pattern             # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_syms                # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-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                                # needs CONFIG_FPROBE
 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 20 lines · Jiri Olsa

We need to deny the attach_override test for arm64, denying the whole kprobe_multi_test suite. Also making attach_override static.

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

v2 changes:
- rebased on latest bpf/master, used just kprobe_multi_test suite name in DENYLIST.aarch64 to cover all kprobe_multi tests

tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -0
index 7f768d335698..b733ce16c0f8 100644

tools/testing/selftests/bpf/DENYLIST.aarch64 line 4

Quoted 4 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -1
@@ -1,14 +1,7 @@
 bpf_cookie/multi_kprobe_attach_api               # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 bpf_cookie/multi_kprobe_link_api                 # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 fexit_sleep                                      # The test never returns. The remaining tests cannot start.
-kprobe_multi_bench_attach                        # bpf_program__attach_kprobe_multi_opts unexpected error: -95

did you drop kprobe_multi_bench_attach from DENYLIST intentionally? I'll leave it in DENYLIST.aarch64 for now when applying

Quoted 27 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -7
-kprobe_multi_test/attach_api_addrs               # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_pattern             # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_syms                # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-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                                # needs CONFIG_FPROBE
 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 16 lines · Andrii Nakryiko
Quoted 15 lines · Jiri Olsa

We need to deny the attach_override test for arm64, denying the whole kprobe_multi_test suite. Also making attach_override static.

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

v2 changes:
- rebased on latest bpf/master, used just kprobe_multi_test suite name in DENYLIST.aarch64 to cover all kprobe_multi tests

Quoted 12 lines

tools/testing/selftests/bpf/DENYLIST.aarch64 line 4

Quoted 9 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +0 -1
index 7f768d335698..b733ce16c0f8 100644
@@ -1,14 +1,7 @@
 bpf_cookie/multi_kprobe_attach_api               # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 bpf_cookie/multi_kprobe_link_api                 # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
 fexit_sleep                                      # The test never returns. The remaining tests cannot start.
-kprobe_multi_bench_attach                        # bpf_program__attach_kprobe_multi_opts unexpected error: -95

did you drop kprobe_multi_bench_attach from DENYLIST intentionally? I'll leave it in DENYLIST.aarch64 for now when applying

ugh, no it should stay.. thanks a lot

jirka

Quoted 28 lines
Quoted 28 lines
tools/testing/selftests/bpf/DENYLIST.aarch64 +1 -7
-kprobe_multi_test/attach_api_addrs               # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_pattern             # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/attach_api_syms                # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-kprobe_multi_test/bench_attach                   # bpf_program__attach_kprobe_multi_opts unexpected error: -95
-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                                # needs CONFIG_FPROBE
 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 Jiri Olsa
This patch was applied to bpf/bpf.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Andrii Nakryiko <[email protected]>:

Quoted 11 lines · On Wed, 13 Sep 2023 13:47:11 +0200 you wrote:

We need to deny the attach_override test for arm64, denying the whole kprobe_multi_test suite. Also making attach_override static.

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

[...]

Here is the summary with links:
- [PATCHv2,bpf] selftests/bpf: Fix kprobe_multi_test/attach_override test

    https://git.kernel.org/bpf/bpf/c/8a19edd4fa6f

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html