From: Eduard Zingerman <eddyz87@gmail.com>
To: Yonghong Song <yhs@fb.com>, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
kernel-team@fb.com, Martin KaFai Lau <martin.lau@kernel.org>
Subject: Re: [PATCH bpf-next 2/2] selftests/bpf: Add a selftest for checking subreg equality
Date: Mon, 17 Apr 2023 20:52:55 +0300 [thread overview]
Message-ID: <f5fadb2274b4e7ddf09a6e6e65a92fed05be4169.camel@gmail.com> (raw)
In-Reply-To: <20230416232813.2389072-1-yhs@fb.com>
On Sun, 2023-04-16 at 16:28 -0700, Yonghong Song wrote:
> Add a selftest to ensure subreg equality if source register
> upper 32bit is 0. Without previous patch, the new test will
> fail verification.
>
> Signed-off-by: Yonghong Song <yhs@fb.com>
> ---
> .../selftests/bpf/prog_tests/verifier.c | 2 ++
> .../selftests/bpf/progs/verifier_reg_equal.c | 27 +++++++++++++++++++
> 2 files changed, 29 insertions(+)
> create mode 100644 tools/testing/selftests/bpf/progs/verifier_reg_equal.c
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
> index 73dff693d411..25bc8958dbfe 100644
> --- a/tools/testing/selftests/bpf/prog_tests/verifier.c
> +++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
> @@ -31,6 +31,7 @@
> #include "verifier_meta_access.skel.h"
> #include "verifier_raw_stack.skel.h"
> #include "verifier_raw_tp_writable.skel.h"
> +#include "verifier_reg_equal.skel.h"
> #include "verifier_ringbuf.skel.h"
> #include "verifier_spill_fill.skel.h"
> #include "verifier_stack_ptr.skel.h"
> @@ -95,6 +96,7 @@ void test_verifier_masking(void) { RUN(verifier_masking); }
> void test_verifier_meta_access(void) { RUN(verifier_meta_access); }
> void test_verifier_raw_stack(void) { RUN(verifier_raw_stack); }
> void test_verifier_raw_tp_writable(void) { RUN(verifier_raw_tp_writable); }
> +void test_verifier_reg_equal(void) { RUN(verifier_reg_equal); }
> void test_verifier_ringbuf(void) { RUN(verifier_ringbuf); }
> void test_verifier_spill_fill(void) { RUN(verifier_spill_fill); }
> void test_verifier_stack_ptr(void) { RUN(verifier_stack_ptr); }
> diff --git a/tools/testing/selftests/bpf/progs/verifier_reg_equal.c b/tools/testing/selftests/bpf/progs/verifier_reg_equal.c
> new file mode 100644
> index 000000000000..91e42dec89ad
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/verifier_reg_equal.c
> @@ -0,0 +1,27 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <linux/bpf.h>
> +#include <bpf/bpf_helpers.h>
> +#include "bpf_misc.h"
> +
> +SEC("socket")
> +__description("check w reg equal if r reg upper32 bits 0")
> +__success
> +__naked void subreg_equality(void)
> +{
> + asm volatile (" \
> + call %[bpf_ktime_get_ns]; \
> + *(u64 *)(r10 - 8) = r0; \
> + r2 = *(u32 *)(r10 - 8); \
> + w3 = w2; \
> + if w2 < 9 goto l0_%=; \
> + exit; \
> +l0_%=: if r3 < 9 goto l1_%=; \
> + r0 -= r1; \
> +l1_%=: exit; \
> +" :
> + : __imm(bpf_ktime_get_ns)
> + : __clobber_all);
> +}
> +
> +char _license[] SEC("license") = "GPL";
Maybe add a few comments in the test case?
E.g.:
--- a/tools/testing/selftests/bpf/progs/verifier_reg_equal.c
+++ b/tools/testing/selftests/bpf/progs/verifier_reg_equal.c
@@ -13,10 +13,16 @@ __naked void subreg_equality(void)
call %[bpf_ktime_get_ns]; \
*(u64 *)(r10 - 8) = r0; \
r2 = *(u32 *)(r10 - 8); \
+ /* At this point upper 4-bytes of r2 are 0, \
+ * thus the w3 = w2 should propagate register id, \
+ * so that w2 < 9 comparison would also propagate \
+ * range for r3. \
+ */ \
w3 = w2; \
if w2 < 9 goto l0_%=; \
exit; \
l0_%=: if r3 < 9 goto l1_%=; \
+ /* r1 read is illegal at this point */ \
r0 -= r1; \
l1_%=: exit; \
" :
Also, do we need a negative test?
(E.g. like this one but with r2 = r0 w/o u32 read from stack).
next prev parent reply other threads:[~2023-04-17 17:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-16 23:28 [PATCH bpf-next 1/2] bpf: Improve verifier u32 scalar equality checking Yonghong Song
2023-04-16 23:28 ` [PATCH bpf-next 2/2] selftests/bpf: Add a selftest for checking subreg equality Yonghong Song
2023-04-17 17:44 ` Eduard Zingerman
2023-04-17 17:52 ` Eduard Zingerman [this message]
2023-04-17 21:54 ` Yonghong Song
2023-04-17 12:40 ` [PATCH bpf-next 1/2] bpf: Improve verifier u32 scalar equality checking Shung-Hsi Yu
2023-04-18 17:54 ` Yonghong Song
2023-04-20 9:16 ` Shung-Hsi Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f5fadb2274b4e7ddf09a6e6e65a92fed05be4169.camel@gmail.com \
--to=eddyz87@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=martin.lau@kernel.org \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.