Skip to content

Commit 31d9cc9

Browse files
image-dragonAlexei Starovoitov
authored andcommitted
selftests/bpf: activate the OP_NE logic in range_cond()
The edge range checking for the registers is supported by the verifier now, so we can activate the extended logic in tools/testing/selftests/bpf/prog_tests/reg_bounds.c/range_cond() to test such logic. Besides, I added some cases to the "crafted_cases" array for this logic. These cases are mainly used to test the edge of the src reg and dst reg. All reg bounds testings has passed in the SLOW_TESTS mode: $ export SLOW_TESTS=1 && ./test_progs -t reg_bounds -j Summary: 65/18959832 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: Menglong Dong <menglong8.dong@gmail.com> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/r/20231219134800.1550388-4-menglong8.dong@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 1de5848 commit 31d9cc9

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

tools/testing/selftests/bpf/prog_tests/reg_bounds.c

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -590,12 +590,7 @@ static void range_cond(enum num_t t, struct range x, struct range y,
590590
*newy = range(t, max_t(t, x.a, y.a), min_t(t, x.b, y.b));
591591
break;
592592
case OP_NE:
593-
/* generic case, can't derive more information */
594-
*newx = range(t, x.a, x.b);
595-
*newy = range(t, y.a, y.b);
596-
break;
597-
598-
/* below extended logic is not supported by verifier just yet */
593+
/* below logic is supported by the verifier now */
599594
if (x.a == x.b && x.a == y.a) {
600595
/* X is a constant matching left side of Y */
601596
*newx = range(t, x.a, x.b);
@@ -2101,6 +2096,18 @@ static struct subtest_case crafted_cases[] = {
21012096
{S32, S64, {(u32)S32_MIN, (u32)(s32)-255}, {(u32)(s32)-2, 0}},
21022097
{S32, S64, {0, 1}, {(u32)S32_MIN, (u32)S32_MIN}},
21032098
{S32, U32, {(u32)S32_MIN, (u32)S32_MIN}, {(u32)S32_MIN, (u32)S32_MIN}},
2099+
2100+
/* edge overlap testings for BPF_NE */
2101+
{U64, U64, {0, U64_MAX}, {U64_MAX, U64_MAX}},
2102+
{U64, U64, {0, U64_MAX}, {0, 0}},
2103+
{S64, U64, {S64_MIN, 0}, {S64_MIN, S64_MIN}},
2104+
{S64, U64, {S64_MIN, 0}, {0, 0}},
2105+
{S64, U64, {S64_MIN, S64_MAX}, {S64_MAX, S64_MAX}},
2106+
{U32, U32, {0, U32_MAX}, {0, 0}},
2107+
{U32, U32, {0, U32_MAX}, {U32_MAX, U32_MAX}},
2108+
{S32, U32, {(u32)S32_MIN, 0}, {0, 0}},
2109+
{S32, U32, {(u32)S32_MIN, 0}, {(u32)S32_MIN, (u32)S32_MIN}},
2110+
{S32, U32, {(u32)S32_MIN, S32_MAX}, {S32_MAX, S32_MAX}},
21042111
};
21052112

21062113
/* Go over crafted hard-coded cases. This is fast, so we do it as part of

0 commit comments

Comments
 (0)