selftests/bpf: adjust test_align expected output

since verifier started to print liveness state of the registers
adjust expected output of test_align.
Now this test checks for both proper alignment handling by verifier
and correctness of liveness marks.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/tools/testing/selftests/bpf/test_align.c b/tools/testing/selftests/bpf/test_align.c
index 8591c89c0828a9ff780c63f4f83f3366f79e198f..fe916d29e166d1ddaf20de4c8876aff644bc32b1 100644 (file)
--- a/tools/testing/selftests/bpf/test_align.c
+++ b/tools/testing/selftests/bpf/test_align.c
@@ -64,11 +64,11 @@ static struct bpf_align_test tests[] = {
                .matches = {
                        {1, "R1=ctx(id=0,off=0,imm=0)"},
                        {1, "R10=fp0"},
-                       {1, "R3=inv2"},
-                       {2, "R3=inv4"},
-                       {3, "R3=inv8"},
-                       {4, "R3=inv16"},
-                       {5, "R3=inv32"},
+                       {1, "R3_w=inv2"},
+                       {2, "R3_w=inv4"},
+                       {3, "R3_w=inv8"},
+                       {4, "R3_w=inv16"},
+                       {5, "R3_w=inv32"},
                },
        },
        {
@@ -92,17 +92,17 @@ static struct bpf_align_test tests[] = {
                .matches = {
                        {1, "R1=ctx(id=0,off=0,imm=0)"},
                        {1, "R10=fp0"},
-                       {1, "R3=inv1"},
-                       {2, "R3=inv2"},
-                       {3, "R3=inv4"},
-                       {4, "R3=inv8"},
-                       {5, "R3=inv16"},
-                       {6, "R3=inv1"},
-                       {7, "R4=inv32"},
-                       {8, "R4=inv16"},
-                       {9, "R4=inv8"},
-                       {10, "R4=inv4"},
-                       {11, "R4=inv2"},
+                       {1, "R3_w=inv1"},
+                       {2, "R3_w=inv2"},
+                       {3, "R3_w=inv4"},
+                       {4, "R3_w=inv8"},
+                       {5, "R3_w=inv16"},
+                       {6, "R3_w=inv1"},
+                       {7, "R4_w=inv32"},
+                       {8, "R4_w=inv16"},
+                       {9, "R4_w=inv8"},
+                       {10, "R4_w=inv4"},
+                       {11, "R4_w=inv2"},
                },
        },
        {
@@ -121,12 +121,12 @@ static struct bpf_align_test tests[] = {
                .matches = {
                        {1, "R1=ctx(id=0,off=0,imm=0)"},
                        {1, "R10=fp0"},
-                       {1, "R3=inv4"},
-                       {2, "R3=inv8"},
-                       {3, "R3=inv10"},
-                       {4, "R4=inv8"},
-                       {5, "R4=inv12"},
-                       {6, "R4=inv14"},
+                       {1, "R3_w=inv4"},
+                       {2, "R3_w=inv8"},
+                       {3, "R3_w=inv10"},
+                       {4, "R4_w=inv8"},
+                       {5, "R4_w=inv12"},
+                       {6, "R4_w=inv14"},
                },
        },
        {
@@ -143,10 +143,10 @@ static struct bpf_align_test tests[] = {
                .matches = {
                        {1, "R1=ctx(id=0,off=0,imm=0)"},
                        {1, "R10=fp0"},
-                       {1, "R3=inv7"},
-                       {2, "R3=inv7"},
-                       {3, "R3=inv14"},
-                       {4, "R3=inv56"},
+                       {1, "R3_w=inv7"},
+                       {2, "R3_w=inv7"},
+                       {3, "R3_w=inv14"},
+                       {4, "R3_w=inv56"},
                },
        },
 
@@ -185,18 +185,18 @@ static struct bpf_align_test tests[] = {
                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
                .matches = {
                        {7, "R0=pkt(id=0,off=8,r=8,imm=0)"},
-                       {7, "R3=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {8, "R3=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
-                       {9, "R3=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
-                       {10, "R3=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
-                       {11, "R3=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
+                       {7, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {8, "R3_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
+                       {9, "R3_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {10, "R3_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
+                       {11, "R3_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
                        {18, "R3=pkt_end(id=0,off=0,imm=0)"},
-                       {18, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {19, "R4=inv(id=0,umax_value=8160,var_off=(0x0; 0x1fe0))"},
-                       {20, "R4=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
-                       {21, "R4=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
-                       {22, "R4=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
-                       {23, "R4=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
+                       {18, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {19, "R4_w=inv(id=0,umax_value=8160,var_off=(0x0; 0x1fe0))"},
+                       {20, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
+                       {21, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
+                       {22, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {23, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
                },
        },
        {
@@ -217,16 +217,16 @@ static struct bpf_align_test tests[] = {
                },
                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
                .matches = {
-                       {7, "R3=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {8, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {9, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {10, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {11, "R4=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
-                       {12, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {13, "R4=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
-                       {14, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {15, "R4=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
-                       {16, "R4=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
+                       {7, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {8, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {9, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {10, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {11, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"},
+                       {12, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {13, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {14, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {15, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"},
+                       {16, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
                },
        },
        {
@@ -257,14 +257,14 @@ static struct bpf_align_test tests[] = {
                },
                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
                .matches = {
-                       {4, "R5=pkt(id=0,off=0,r=0,imm=0)"},
-                       {5, "R5=pkt(id=0,off=14,r=0,imm=0)"},
-                       {6, "R4=pkt(id=0,off=14,r=0,imm=0)"},
+                       {4, "R5_w=pkt(id=0,off=0,r=0,imm=0)"},
+                       {5, "R5_w=pkt(id=0,off=14,r=0,imm=0)"},
+                       {6, "R4_w=pkt(id=0,off=14,r=0,imm=0)"},
                        {10, "R2=pkt(id=0,off=0,r=18,imm=0)"},
                        {10, "R5=pkt(id=0,off=14,r=18,imm=0)"},
-                       {10, "R4=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
-                       {14, "R4=inv(id=0,umax_value=65535,var_off=(0x0; 0xffff))"},
-                       {15, "R4=inv(id=0,umax_value=65535,var_off=(0x0; 0xffff))"},
+                       {10, "R4_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"},
+                       {14, "R4_w=inv(id=0,umax_value=65535,var_off=(0x0; 0xffff))"},
+                       {15, "R4_w=inv(id=0,umax_value=65535,var_off=(0x0; 0xffff))"},
                },
        },
        {
@@ -320,11 +320,11 @@ static struct bpf_align_test tests[] = {
                         * alignment of 4.
                         */
                        {8, "R2=pkt(id=0,off=0,r=8,imm=0)"},
-                       {8, "R6=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {8, "R6_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Offset is added to packet pointer R5, resulting in
                         * known fixed offset, and variable offset from R6.
                         */
-                       {11, "R5=pkt(id=1,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {11, "R5_w=pkt(id=1,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* At the time the word size load is performed from R5,
                         * it's total offset is NET_IP_ALIGN + reg->off (0) +
                         * reg->aux_off (14) which is 16.  Then the variable
@@ -336,11 +336,11 @@ static struct bpf_align_test tests[] = {
                        /* Variable offset is added to R5 packet pointer,
                         * resulting in auxiliary alignment of 4.
                         */
-                       {18, "R5=pkt(id=2,off=0,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {18, "R5_w=pkt(id=2,off=0,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Constant offset is added to R5, resulting in
                         * reg->off of 14.
                         */
-                       {19, "R5=pkt(id=2,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {19, "R5_w=pkt(id=2,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* At the time the word size load is performed from R5,
                         * its total fixed offset is NET_IP_ALIGN + reg->off
                         * (14) which is 16.  Then the variable offset is 4-byte
@@ -352,18 +352,18 @@ static struct bpf_align_test tests[] = {
                        /* Constant offset is added to R5 packet pointer,
                         * resulting in reg->off value of 14.
                         */
-                       {26, "R5=pkt(id=0,off=14,r=8"},
+                       {26, "R5_w=pkt(id=0,off=14,r=8"},
                        /* Variable offset is added to R5, resulting in a
                         * variable offset of (4n).
                         */
-                       {27, "R5=pkt(id=3,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {27, "R5_w=pkt(id=3,off=14,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Constant is added to R5 again, setting reg->off to 18. */
-                       {28, "R5=pkt(id=3,off=18,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {28, "R5_w=pkt(id=3,off=18,r=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* And once more we add a variable; resulting var_off
                         * is still (4n), fixed offset is not changed.
                         * Also, we create a new reg->id.
                         */
-                       {29, "R5=pkt(id=4,off=18,r=0,umax_value=2040,var_off=(0x0; 0x7fc))"},
+                       {29, "R5_w=pkt(id=4,off=18,r=0,umax_value=2040,var_off=(0x0; 0x7fc))"},
                        /* At the time the word size load is performed from R5,
                         * its total fixed offset is NET_IP_ALIGN + reg->off (18)
                         * which is 20.  Then the variable offset is (4n), so
@@ -410,11 +410,11 @@ static struct bpf_align_test tests[] = {
                         * alignment of 4.
                         */
                        {8, "R2=pkt(id=0,off=0,r=8,imm=0)"},
-                       {8, "R6=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {8, "R6_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Adding 14 makes R6 be (4n+2) */
-                       {9, "R6=inv(id=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
+                       {9, "R6_w=inv(id=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
                        /* Packet pointer has (4n+2) offset */
-                       {11, "R5=pkt(id=1,off=0,r=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
+                       {11, "R5_w=pkt(id=1,off=0,r=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
                        {13, "R4=pkt(id=1,off=4,r=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
                        /* At the time the word size load is performed from R5,
                         * its total fixed offset is NET_IP_ALIGN + reg->off (0)
@@ -426,11 +426,11 @@ static struct bpf_align_test tests[] = {
                        /* Newly read value in R6 was shifted left by 2, so has
                         * known alignment of 4.
                         */
-                       {18, "R6=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {18, "R6_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Added (4n) to packet pointer's (4n+2) var_off, giving
                         * another (4n+2).
                         */
-                       {19, "R5=pkt(id=2,off=0,r=0,umin_value=14,umax_value=2054,var_off=(0x2; 0xffc))"},
+                       {19, "R5_w=pkt(id=2,off=0,r=0,umin_value=14,umax_value=2054,var_off=(0x2; 0xffc))"},
                        {21, "R4=pkt(id=2,off=4,r=0,umin_value=14,umax_value=2054,var_off=(0x2; 0xffc))"},
                        /* At the time the word size load is performed from R5,
                         * its total fixed offset is NET_IP_ALIGN + reg->off (0)
@@ -473,11 +473,11 @@ static struct bpf_align_test tests[] = {
                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
                .result = REJECT,
                .matches = {
-                       {4, "R5=pkt(id=0,off=0,r=0,imm=0)"},
+                       {4, "R5_w=pkt(id=0,off=0,r=0,imm=0)"},
                        /* ptr & 0x40 == either 0 or 0x40 */
-                       {5, "R5=inv(id=0,umax_value=64,var_off=(0x0; 0x40))"},
+                       {5, "R5_w=inv(id=0,umax_value=64,var_off=(0x0; 0x40))"},
                        /* ptr << 2 == unknown, (4n) */
-                       {7, "R5=inv(id=0,smax_value=9223372036854775804,umax_value=18446744073709551612,var_off=(0x0; 0xfffffffffffffffc))"},
+                       {7, "R5_w=inv(id=0,smax_value=9223372036854775804,umax_value=18446744073709551612,var_off=(0x0; 0xfffffffffffffffc))"},
                        /* (4n) + 14 == (4n+2).  We blow our bounds, because
                         * the add could overflow.
                         */
@@ -485,7 +485,7 @@ static struct bpf_align_test tests[] = {
                        /* Checked s>=0 */
                        {10, "R5=inv(id=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
                        /* packet pointer + nonnegative (4n+2) */
-                       {12, "R6=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
+                       {12, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
                        {14, "R4=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
                        /* NET_IP_ALIGN + (4n+2) == (4n), alignment is fine.
                         * We checked the bounds, but it might have been able
@@ -530,11 +530,11 @@ static struct bpf_align_test tests[] = {
                         * alignment of 4.
                         */
                        {7, "R2=pkt(id=0,off=0,r=8,imm=0)"},
-                       {9, "R6=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {9, "R6_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Adding 14 makes R6 be (4n+2) */
-                       {10, "R6=inv(id=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
+                       {10, "R6_w=inv(id=0,umin_value=14,umax_value=1034,var_off=(0x2; 0x7fc))"},
                        /* New unknown value in R7 is (4n) */
-                       {11, "R7=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
+                       {11, "R7_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"},
                        /* Subtracting it from R6 blows our unsigned bounds */
                        {12, "R6=inv(id=0,smin_value=-1006,smax_value=1034,var_off=(0x2; 0xfffffffffffffffc))"},
                        /* Checked s>= 0 */
@@ -583,15 +583,15 @@ static struct bpf_align_test tests[] = {
                         * alignment of 4.
                         */
                        {7, "R2=pkt(id=0,off=0,r=8,imm=0)"},
-                       {10, "R6=inv(id=0,umax_value=60,var_off=(0x0; 0x3c))"},
+                       {10, "R6_w=inv(id=0,umax_value=60,var_off=(0x0; 0x3c))"},
                        /* Adding 14 makes R6 be (4n+2) */
-                       {11, "R6=inv(id=0,umin_value=14,umax_value=74,var_off=(0x2; 0x7c))"},
+                       {11, "R6_w=inv(id=0,umin_value=14,umax_value=74,var_off=(0x2; 0x7c))"},
                        /* Subtracting from packet pointer overflows ubounds */
-                       {13, "R5=pkt(id=1,off=0,r=8,umin_value=18446744073709551542,umax_value=18446744073709551602,var_off=(0xffffffffffffff82; 0x7c))"},
+                       {13, "R5_w=pkt(id=1,off=0,r=8,umin_value=18446744073709551542,umax_value=18446744073709551602,var_off=(0xffffffffffffff82; 0x7c))"},
                        /* New unknown value in R7 is (4n), >= 76 */
-                       {15, "R7=inv(id=0,umin_value=76,umax_value=1096,var_off=(0x0; 0x7fc))"},
+                       {15, "R7_w=inv(id=0,umin_value=76,umax_value=1096,var_off=(0x0; 0x7fc))"},
                        /* Adding it to packet pointer gives nice bounds again */
-                       {16, "R5=pkt(id=2,off=0,r=0,umin_value=2,umax_value=1082,var_off=(0x2; 0x7fc))"},
+                       {16, "R5_w=pkt(id=2,off=0,r=0,umin_value=2,umax_value=1082,var_off=(0x2; 0x7fc))"},
                        /* At the time the word size load is performed from R5,
                         * its total fixed offset is NET_IP_ALIGN + reg->off (0)
                         * which is 2.  Then the variable offset is (4n+2), so