netdev - Re: [PATCH bpf-next] selftests/bpf: skip module_fentry_shadow test when bpf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAEf4BzaAgSSj7W7S4uX=NormhaG1=ty8XumTRcSSEPd0XC4ocg@mail.gmail.com>
Date: Thu, 14 Sep 2023 11:17:29 -0700
From: Andrii Nakryiko <andrii.nakryiko@...il.com>
To: Artem Savkov <asavkov@...hat.com>
Cc: Alexei Starovoitov <ast@...nel.org>, Daniel Borkmann <daniel@...earbox.net>, 
	Andrii Nakryiko <andrii@...nel.org>, bpf@...r.kernel.org, netdev@...r.kernel.org, 
	vmalik@...hat.com, linux-kernel@...r.kernel.org
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 <asavkov@...hat.com> 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 <asavkov@...hat.com>
> ---
>  .../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/20230914124928.340701-1-asavkov@redhat.com/

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