Received-SPF: pass (google.com: domain of linux-kernel+bounces-34731-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240122075700.7120-1-yangtiezhu@loongson.cn> <20240122075700.7120-4-yangtiezhu@loongson.cn>
 <CAEf4Bzaj=W3tUbfKRbQ3JgYqXimthVOs9uvmj4YxkbDhE3v0SA@mail.gmail.com> <15c4c8b2-9561-37b9-91d9-ce4ec76537e4@loongson.cn>
In-Reply-To: <15c4c8b2-9561-37b9-91d9-ce4ec76537e4@loongson.cn>
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date: Mon, 22 Jan 2024 21:43:32 -0800
Message-ID: <CAEf4BzZuMJ7gsRLL03irRrMH6DAO-NsvQoiYrfV4Ga_3hJUMWA@mail.gmail.com>
Subject: Re: [PATCH bpf-next v6 3/3] selftests/bpf: Skip callback tests if jit
 is disabled in test_verifier
To: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, 
	Andrii Nakryiko <andrii@kernel.org>, Eduard Zingerman <eddyz87@gmail.com>, 
	John Fastabend <john.fastabend@gmail.com>, Jiri Olsa <jolsa@kernel.org>, 
	Hou Tao <houtao@huaweicloud.com>, Song Liu <song@kernel.org>, bpf@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 22, 2024 at 7:35=E2=80=AFPM Tiezhu Yang <yangtiezhu@loongson.cn=
> wrote:
>
>
>
> On 01/23/2024 09:08 AM, Andrii Nakryiko wrote:
> > On Sun, Jan 21, 2024 at 11:57=E2=80=AFPM Tiezhu Yang <yangtiezhu@loongs=
on.cn> wrote:
> >>
> >> If CONFIG_BPF_JIT_ALWAYS_ON is not set and bpf_jit_enable is 0, there
> >> exist 6 failed tests.
>
> ...
>
> >>         if (expected_ret =3D=3D ACCEPT || expected_ret =3D=3D VERBOSE_=
ACCEPT) {
> >> +               if (fd_prog < 0 && saved_errno =3D=3D EINVAL && jit_di=
sabled) {
> >> +                       for (i =3D 0; i < prog_len; i++, prog++) {
> >> +                               if (!insn_is_pseudo_func(prog))
> >> +                                       continue;
> >> +                               printf("SKIP (callbacks are not allowe=
d in non-JITed programs)\n");
> >> +                               skips++;
> >> +                               goto close_fds;
> >> +                       }
> >> +               }
> >
> > Wouldn't it be better to add an explicit flag to those tests to mark
> > that they require JIT enabled, instead of trying to derive this from
> > analysing their BPF instructions?
>
> Maybe something like this, add test flag F_NEEDS_JIT_ENABLED in
> bpf_loop_inline.c, check the flag and jit_disabled at the beginning
> of do_test_single(), no need to check fd_prog, saved_errno and the other
> conditions, the patch #2 can be removed too.
>
> If you are OK with the following changes, I will send v7 later.
>

Yes, I think this approach is much better, thanks.

> ----->8-----
>
> diff --git a/tools/testing/selftests/bpf/test_verifier.c
> b/tools/testing/selftests/bpf/test_verifier.c
> index 1a09fc34d093..c65915188d7c 100644
> --- a/tools/testing/selftests/bpf/test_verifier.c
> +++ b/tools/testing/selftests/bpf/test_verifier.c
> @@ -67,6 +67,7 @@
>
>   #define F_NEEDS_EFFICIENT_UNALIGNED_ACCESS     (1 << 0)
>   #define F_LOAD_WITH_STRICT_ALIGNMENT           (1 << 1)
> +#define F_NEEDS_JIT_ENABLED                    (1 << 2)
>
>   /* need CAP_BPF, CAP_NET_ADMIN, CAP_PERFMON to load progs */
>   #define ADMIN_CAPS (1ULL << CAP_NET_ADMIN |    \
> @@ -74,6 +75,7 @@
>                      1ULL << CAP_BPF)
>   #define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled"
>   static bool unpriv_disabled =3D false;
> +static bool jit_disabled;
>   static int skips;
>   static bool verbose =3D false;
>   static int verif_log_level =3D 0;
> @@ -1524,6 +1526,13 @@ static void do_test_single(struct bpf_test *test,
> bool unpriv,
>          __u32 pflags;
>          int i, err;
>
> +       if ((test->flags & F_NEEDS_JIT_ENABLED) && jit_disabled) {
> +               printf("SKIP (callbacks are not allowed in non-JITed
> programs)\n");
> +               skips++;
> +               sched_yield();
> +               return;
> +       }
> +
>          fd_prog =3D -1;
>          for (i =3D 0; i < MAX_NR_MAPS; i++)
>                  map_fds[i] =3D -1;
> @@ -1844,6 +1853,8 @@ int main(int argc, char **argv)
>                  return EXIT_FAILURE;
>          }
>
> +       jit_disabled =3D !is_jit_enabled();
> +
>          /* Use libbpf 1.0 API mode */
>          libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
>
> diff --git a/tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
> b/tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
> index a535d41dc20d..59125b22ae39 100644
> --- a/tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
> +++ b/tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
> @@ -57,6 +57,7 @@
>          .expected_insns =3D { PSEUDO_CALL_INSN() },
>          .unexpected_insns =3D { HELPER_CALL_INSN() },
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .result =3D ACCEPT,
>          .runs =3D 0,
>          .func_info =3D { { 0, MAIN_TYPE }, { 12, CALLBACK_TYPE } },
> @@ -90,6 +91,7 @@
>          .expected_insns =3D { HELPER_CALL_INSN() },
>          .unexpected_insns =3D { PSEUDO_CALL_INSN() },
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .result =3D ACCEPT,
>          .runs =3D 0,
>          .func_info =3D { { 0, MAIN_TYPE }, { 16, CALLBACK_TYPE } },
> @@ -127,6 +129,7 @@
>          .expected_insns =3D { HELPER_CALL_INSN() },
>          .unexpected_insns =3D { PSEUDO_CALL_INSN() },
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .result =3D ACCEPT,
>          .runs =3D 0,
>          .func_info =3D {
> @@ -165,6 +168,7 @@
>          .expected_insns =3D { PSEUDO_CALL_INSN() },
>          .unexpected_insns =3D { HELPER_CALL_INSN() },
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .result =3D ACCEPT,
>          .runs =3D 0,
>          .func_info =3D {
> @@ -235,6 +239,7 @@
>          },
>          .unexpected_insns =3D { HELPER_CALL_INSN() },
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .result =3D ACCEPT,
>          .func_info =3D {
>                  { 0, MAIN_TYPE },
> @@ -252,6 +257,7 @@
>          .unexpected_insns =3D { HELPER_CALL_INSN() },
>          .result =3D ACCEPT,
>          .prog_type =3D BPF_PROG_TYPE_TRACEPOINT,
> +       .flags =3D F_NEEDS_JIT_ENABLED,
>          .func_info =3D { { 0, MAIN_TYPE }, { 16, CALLBACK_TYPE } },
>          .func_info_cnt =3D 2,
>          BTF_TYPES
>
> Thanks,
> Tiezhu
>