diff mbox series

[PATCHv2,bpf] selftests/bpf: Fix kprobe_multi_test/attach_override test

Message ID 20230913114711.499829-1-jolsa@kernel.org (mailing list archive)
State Accepted
Commit 8a19edd4fa6f5b22d5a35bb7c8bb3e7c571a74d4
Delegated to: BPF
Headers show
Series [PATCHv2,bpf] selftests/bpf: Fix kprobe_multi_test/attach_override test | expand

Checks

Context Check Description
bpf/vmtest-bpf-VM_Test-2 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-6 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-8 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-10 success Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-16 success Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-13 success Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-14 success Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-18 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-21 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-19 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-20 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-23 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-22 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-25 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-27 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-28 success Logs for veristat
bpf/vmtest-bpf-VM_Test-15 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-11 success Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-7 success Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-17 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 9 this patch: 9
netdev/cc_maintainers warning 8 maintainers not CCed: linux-kselftest@vger.kernel.org shuah@kernel.org mykolal@fb.com martin.lau@linux.dev yonghong.song@linux.dev xukuohai@huawei.com kpsingh@kernel.org song@kernel.org
netdev/build_clang success Errors and warnings before: 9 this patch: 9
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 9 this patch: 9
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 23 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-0 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-5 success Logs for set-matrix
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-4 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-1 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-3 success Logs for build for x86_64 with gcc

Commit Message

Jiri Olsa Sept. 13, 2023, 11:47 a.m. UTC 
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")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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

Comments

Andrii Nakryiko Sept. 13, 2023, 6:43 p.m. UTC | #1 
On Wed, Sep 13, 2023 at 4:47 AM Jiri Olsa <jolsa@kernel.org> 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")
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  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
>
> diff --git a/tools/testing/selftests/bpf/DENYLIST.aarch64 b/tools/testing/selftests/bpf/DENYLIST.aarch64
> index 7f768d335698..b733ce16c0f8 100644
> --- a/tools/testing/selftests/bpf/DENYLIST.aarch64
> +++ b/tools/testing/selftests/bpf/DENYLIST.aarch64
> @@ -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

> -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
> diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> index e05477b210a5..4041cfa670eb 100644
> --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> @@ -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
>
patchwork-bot+netdevbpf@kernel.org Sept. 13, 2023, 6:50 p.m. UTC | #2 
Hello:

This patch was applied to bpf/bpf.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

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")
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  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!
Jiri Olsa Sept. 14, 2023, 6:31 a.m. UTC | #3 
On Wed, Sep 13, 2023 at 11:43:47AM -0700, Andrii Nakryiko wrote:
> On Wed, Sep 13, 2023 at 4:47 AM Jiri Olsa <jolsa@kernel.org> 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")
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  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
> >
> > diff --git a/tools/testing/selftests/bpf/DENYLIST.aarch64 b/tools/testing/selftests/bpf/DENYLIST.aarch64
> > index 7f768d335698..b733ce16c0f8 100644
> > --- a/tools/testing/selftests/bpf/DENYLIST.aarch64
> > +++ b/tools/testing/selftests/bpf/DENYLIST.aarch64
> > @@ -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

> 
> > -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
> > diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> > index e05477b210a5..4041cfa670eb 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
> > @@ -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
> >
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/DENYLIST.aarch64 b/tools/testing/selftests/bpf/DENYLIST.aarch64
index 7f768d335698..b733ce16c0f8 100644
--- a/tools/testing/selftests/bpf/DENYLIST.aarch64
+++ b/tools/testing/selftests/bpf/DENYLIST.aarch64
@@ -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
diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
index e05477b210a5..4041cfa670eb 100644
--- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
@@ -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;