2023-09-14 12:50:28

by Artem Savkov

Subject: [PATCH bpf-next] selftests/bpf: skip module_fentry_shadow test when bpf_testmod is not available

This test relies on bpf_testmod, so skip it if the module is not available.

Fixes: aa3d65de4b900 ("bpf/selftests: Test fentry attachment to shadowed functions")
Signed-off-by: Artem Savkov <[email protected]>
---
.../testing/selftests/bpf/prog_tests/module_fentry_shadow.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
index c7636e18b1ebd..cdd55e5340dec 100644
--- a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
+++ b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
@@ -61,6 +61,11 @@ void test_module_fentry_shadow(void)
int link_fd[2] = {};
__s32 btf_id[2] = {};

+ if (!env.has_testmod) {
+ test__skip();
+ return;
+ }
+
LIBBPF_OPTS(bpf_prog_load_opts, load_opts,
.expected_attach_type = BPF_TRACE_FENTRY,
);
--
2.41.0

2023-09-14 18:24:12

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf-next] selftests/bpf: skip module_fentry_shadow test when bpf_testmod is not available

Hello:

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

On Thu, 14 Sep 2023 14:49:28 +0200 you wrote:
> This test relies on bpf_testmod, so skip it if the module is not available.
>
> Fixes: aa3d65de4b900 ("bpf/selftests: Test fentry attachment to shadowed functions")
> Signed-off-by: Artem Savkov <[email protected]>
> ---
> .../testing/selftests/bpf/prog_tests/module_fentry_shadow.c | 5 +++++
> 1 file changed, 5 insertions(+)

Here is the summary with links:
- [bpf-next] selftests/bpf: skip module_fentry_shadow test when bpf_testmod is not available
https://git.kernel.org/bpf/bpf-next/c/971f7c32147f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

2023-09-15 03:38:46

by Andrii Nakryiko

Subject: Re: [PATCH bpf-next] selftests/bpf: skip module_fentry_shadow test when bpf_testmod is not available

On Thu, Sep 14, 2023 at 5:49 AM Artem Savkov <[email protected]> wrote:
>
> This test relies on bpf_testmod, so skip it if the module is not available.
>
> Fixes: aa3d65de4b900 ("bpf/selftests: Test fentry attachment to shadowed functions")
> Signed-off-by: Artem Savkov <[email protected]>
> ---
> .../testing/selftests/bpf/prog_tests/module_fentry_shadow.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
> index c7636e18b1ebd..cdd55e5340dec 100644
> --- a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
> +++ b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
> @@ -61,6 +61,11 @@ void test_module_fentry_shadow(void)
> int link_fd[2] = {};
> __s32 btf_id[2] = {};
>
> + if (!env.has_testmod) {
> + test__skip();
> + return;
> + }
> +

you used spaces for indentation, please don't do that. It was also
obvious if you looked at patchworks status ([0]). I fixed it up while
applying, but keep this in mind for the future. Thanks.

[0] https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/

> LIBBPF_OPTS(bpf_prog_load_opts, load_opts,
> .expected_attach_type = BPF_TRACE_FENTRY,
> );
> --
> 2.41.0
>