Received-SPF: pass (google.com: domain of linux-kernel+bounces-5822-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20231219134800.1550388-1-menglong8.dong@gmail.com> <20231219134800.1550388-5-menglong8.dong@gmail.com>
In-Reply-To: <20231219134800.1550388-5-menglong8.dong@gmail.com>
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date: Tue, 19 Dec 2023 10:42:03 -0800
Message-ID: <CAEf4BzYN2Mdx6zY01Uq3Kod41j96H3WfuN=PjCcOO=ZrUbVB9w@mail.gmail.com>
Subject: Re: [PATCH bpf-next v5 4/4] selftests/bpf: add testcase to
 verifier_bounds.c for BPF_JNE
To: Menglong Dong <menglong8.dong@gmail.com>
Cc: andrii@kernel.org, eddyz87@gmail.com, yonghong.song@linux.dev, 
	alexei.starovoitov@gmail.com, ast@kernel.org, daniel@iogearbox.net, 
	john.fastabend@gmail.com, martin.lau@linux.dev, song@kernel.org, 
	kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, 
	mykolal@fb.com, shuah@kernel.org, bpf@vger.kernel.org, 
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 19, 2023 at 5:51=E2=80=AFAM Menglong Dong <menglong8.dong@gmail=
.com> wrote:
>
> Add testcase for the logic that the verifier tracks the BPF_JNE for regs.
> The assembly function "reg_not_equal_const()" and "reg_equal_const" that
> we add is exactly converted from the following case:
>
>   u32 a =3D bpf_get_prandom_u32();
>   u64 b =3D 0;
>
>   a %=3D 8;
>   /* the "a > 0" here will be optimized to "a !=3D 0" */
>   if (a > 0) {
>     /* now the range of a should be [1, 7] */
>     bpf_skb_store_bytes(skb, 0, &b, a, 0);
>   }
>
> Signed-off-by: Menglong Dong <menglong8.dong@gmail.com>
> ---
> v5:
> - add some comments to the function that we add
> - add reg_not_equal_const()
> ---
>  .../selftests/bpf/progs/verifier_bounds.c     | 62 +++++++++++++++++++
>  1 file changed, 62 insertions(+)
>

LGTM

Acked-by: Andrii Nakryiko <andrii@kernel.org>

> diff --git a/tools/testing/selftests/bpf/progs/verifier_bounds.c b/tools/=
testing/selftests/bpf/progs/verifier_bounds.c
> index ec430b71730b..960998f16306 100644
> --- a/tools/testing/selftests/bpf/progs/verifier_bounds.c
> +++ b/tools/testing/selftests/bpf/progs/verifier_bounds.c
> @@ -1075,4 +1075,66 @@ l0_%=3D:   r0 =3D 0;                              =
           \
>         : __clobber_all);
>  }
>
> +SEC("tc")
> +__description("bounds check with JMP_NE for reg edge")
> +__success __retval(0)
> +__naked void reg_not_equal_const(void)
> +{
> +       asm volatile ("                                 \
> +       r6 =3D r1;                                        \
> +       r1 =3D 0;                                         \
> +       *(u64*)(r10 - 8) =3D r1;                          \
> +       call %[bpf_get_prandom_u32];                    \
> +       r4 =3D r0;                                        \
> +       r4 &=3D 7;                                        \
> +       if r4 !=3D 0 goto l0_%=3D;                          \
> +       r0 =3D 0;                                         \
> +       exit;                                           \
> +l0_%=3D: r1 =3D r6;                                        \
> +       r2 =3D 0;                                         \
> +       r3 =3D r10;                                       \
> +       r3 +=3D -8;                                       \
> +       r5 =3D 0;                                         \
> +       /* The 4th argument of bpf_skb_store_bytes is defined as \
> +        * ARG_CONST_SIZE, so 0 is not allowed. The 'r4 !=3D 0' \
> +        * is providing us this exclusion of zero from initial \
> +        * [0, 7] range.                                \
> +        */                                             \
> +       call %[bpf_skb_store_bytes];                    \
> +       r0 =3D 0;                                         \
> +       exit;                                           \
> +"      :
> +       : __imm(bpf_get_prandom_u32),
> +         __imm(bpf_skb_store_bytes)
> +       : __clobber_all);
> +}
> +
> +SEC("tc")
> +__description("bounds check with JMP_EQ for reg edge")
> +__success __retval(0)
> +__naked void reg_equal_const(void)
> +{
> +       asm volatile ("                                 \
> +       r6 =3D r1;                                        \
> +       r1 =3D 0;                                         \
> +       *(u64*)(r10 - 8) =3D r1;                          \
> +       call %[bpf_get_prandom_u32];                    \
> +       r4 =3D r0;                                        \
> +       r4 &=3D 7;                                        \
> +       if r4 =3D=3D 0 goto l0_%=3D;                          \
> +       r1 =3D r6;                                        \
> +       r2 =3D 0;                                         \
> +       r3 =3D r10;                                       \
> +       r3 +=3D -8;                                       \
> +       r5 =3D 0;                                         \
> +       /* Just the same as what we do in reg_not_equal_const() */ \
> +       call %[bpf_skb_store_bytes];                    \
> +l0_%=3D: r0 =3D 0;                                         \
> +       exit;                                           \
> +"      :
> +       : __imm(bpf_get_prandom_u32),
> +         __imm(bpf_skb_store_bytes)
> +       : __clobber_all);
> +}
> +
>  char _license[] SEC("license") =3D "GPL";
> --
> 2.39.2
>