Small BPF verifier log improvements
Subsystems (4)
PATCH v5 1/1 Small BPF verifier log improvements
In particular:
1) remove output of inv for scalars in print_verifier_state
2) replace inv with scalar in verifier error messages
3) remove _value suffixes for umin/umax/s32_min/etc (except map_value)
4) remove output of id=0
5) remove output of ref_obj_id=0
--- kernel/bpf/verifier.c | 65 +++--- .../testing/selftests/bpf/prog_tests/align.c | 218 +++++++++--------- .../selftests/bpf/prog_tests/log_buf.c | 4 +- .../selftests/bpf/verifier/atomic_invalid.c | 6 +- tools/testing/selftests/bpf/verifier/bounds.c | 4 +- tools/testing/selftests/bpf/verifier/calls.c | 6 +- tools/testing/selftests/bpf/verifier/ctx.c | 4 +- .../bpf/verifier/direct_packet_access.c | 2 +- .../bpf/verifier/helper_access_var_len.c | 6 +- tools/testing/selftests/bpf/verifier/jmp32.c | 16 +- .../testing/selftests/bpf/verifier/precise.c | 4 +- .../selftests/bpf/verifier/raw_stack.c | 4 +- .../selftests/bpf/verifier/ref_tracking.c | 6 +- .../selftests/bpf/verifier/search_pruning.c | 2 +- tools/testing/selftests/bpf/verifier/sock.c | 2 +- .../selftests/bpf/verifier/spill_fill.c | 38 +-- tools/testing/selftests/bpf/verifier/unpriv.c | 4 +- .../bpf/verifier/value_illegal_alu.c | 4 +- .../selftests/bpf/verifier/value_ptr_arith.c | 4 +- .../testing/selftests/bpf/verifier/var_off.c | 2 +- 20 files changed, 204 insertions(+), 197 deletions(-)
kernel/bpf/verifier.c +36 -29
@@ -539,7 +539,7 @@ static const char *reg_type_str(struct bpf_verifier_env *env,char postfix[16 ] = {0 }, prefix[32 ] = {0 };static const char *const str[] = { [NOT_INIT ] ="?" , - [SCALAR_VALUE ] ="inv" , + [SCALAR_VALUE ] ="scalar" , [PTR_TO_CTX ] ="ctx" , [CONST_PTR_TO_MAP ] ="map_ptr" , [PTR_TO_MAP_VALUE ] ="map_value" ,
@@ -685,74 +685,81 @@ static void print_verifier_state(struct bpf_verifier_env *env,continue ;verbose (env," R%d" , i);print_liveness (env, reg->live); -verbose (env,"=%s" ,reg_type_str (env, t)); +verbose (env,"=" );if (t ==SCALAR_VALUE && reg->precise)verbose (env,"P" );if ((t ==SCALAR_VALUE || t ==PTR_TO_STACK ) &&tnum_is_const (reg->var_off)) {/* reg->off should be 0 for SCALAR_VALUE */ +verbose (env,"%s" , t ==SCALAR_VALUE ?"" :reg_type_str (env, t));verbose (env,"%lld" , reg->var_off.value + reg->off); }else { +const char *sep ="" ; + +verbose (env,"%s" ,reg_type_str (env, t));if (base_type (t) ==PTR_TO_BTF_ID ||base_type (t) ==PTR_TO_PERCPU_BTF_ID )verbose (env,"%s" ,kernel_type_name (reg->btf, reg->btf_id)); -verbose (env,"(id=%d" , reg->id); -if (reg_type_may_be_refcounted_or_null (t)) -verbose (env,",ref_obj_id=%d" , reg->ref_obj_id); +verbose (env,"(" ); + +/* +* _a stands for append, was shortened to avoid multiline statements below. this macro is used to +* output a comma separated list of attributes +*/ +#define verbose_a (fmt, ...) ({ verbose(env, "%s" fmt, sep, __VA_ARGS__); sep = ","; }) + +if (reg->id) +verbose_a ("id=%d" , reg->id); +if (reg_type_may_be_refcounted_or_null (t) && reg->ref_obj_id) +verbose_a ("ref_obj_id=%d" , reg->ref_obj_id);if (t !=SCALAR_VALUE ) -verbose (env,",off=%d" , reg->off); +verbose_a ("off=%d" , reg->off);if (type_is_pkt_pointer (t)) -verbose (env,",r=%d" , reg->range); +verbose_a ("r=%d" , reg->range);else if (base_type (t) ==CONST_PTR_TO_MAP ||base_type (t) ==PTR_TO_MAP_KEY ||base_type (t) ==PTR_TO_MAP_VALUE ) -verbose (env,",ks=%d,vs=%d" , - reg->map_ptr->key_size, - reg->map_ptr->value_size); +verbose_a ("ks=%d,vs=%d" , + reg->map_ptr->key_size, + reg->map_ptr->value_size);if (tnum_is_const (reg->var_off)) {/* Typically an immediate SCALAR_VALUE, but * could be a pointer whose offset is too big * for reg->off */ -verbose (env,",imm=%llx" , reg->var_off.value); +verbose_a ("imm=%llx" , reg->var_off.value); }else {if (reg->smin_value != reg->umin_value && reg->smin_value !=S64_MIN ) -verbose (env,",smin_value=%lld" , - (long long )reg->smin_value); +verbose_a ("smin=%lld" , (long long )reg->smin_value);if (reg->smax_value != reg->umax_value && reg->smax_value !=S64_MAX ) -verbose (env,",smax_value=%lld" , - (long long )reg->smax_value); +verbose_a ("smax=%lld" , (long long )reg->smax_value);if (reg->umin_value !=0 ) -verbose (env,",umin_value=%llu" , - (unsigned long long )reg->umin_value); +verbose_a ("umin=%llu" , (unsigned long long )reg->umin_value);if (reg->umax_value !=U64_MAX ) -verbose (env,",umax_value=%llu" , - (unsigned long long )reg->umax_value); +verbose_a ("umax=%llu" , (unsigned long long )reg->umax_value);if (!tnum_is_unknown (reg->var_off)) {char tn_buf[48 ];tnum_strn (tn_buf,sizeof (tn_buf), reg->var_off); -verbose (env,",var_off=%s" , tn_buf); +verbose_a ("var_off=%s" , tn_buf); }if (reg->s32_min_value != reg->smin_value && reg->s32_min_value !=S32_MIN ) -verbose (env,",s32_min_value=%d" , - (int )(reg->s32_min_value)); +verbose_a ("s32_min=%d" , (int )(reg->s32_min_value));if (reg->s32_max_value != reg->smax_value && reg->s32_max_value !=S32_MAX ) -verbose (env,",s32_max_value=%d" , - (int )(reg->s32_max_value)); +verbose_a ("s32_max=%d" , (int )(reg->s32_max_value));if (reg->u32_min_value != reg->umin_value && reg->u32_min_value !=U32_MIN ) -verbose (env,",u32_min_value=%d" , - (int )(reg->u32_min_value)); +verbose_a ("u32_min=%d" , (int )(reg->u32_min_value));if (reg->u32_max_value != reg->umax_value && reg->u32_max_value !=U32_MAX ) -verbose (env,",u32_max_value=%d" , - (int )(reg->u32_max_value)); +verbose_a ("u32_max=%d" , (int )(reg->u32_max_value)); } +#undef verbose_a +verbose (env,")" ); } }
@@ -777,7 +784,7 @@ static void print_verifier_state(struct bpf_verifier_env *env,if (is_spilled_reg (&state->stack[i])) { reg = &state->stack[i].spilled_ptr; t = reg->type; -verbose (env,"=%s" ,reg_type_str (env, t)); +verbose (env,"=%s" , t ==SCALAR_VALUE ?"" :reg_type_str (env, t));if (t ==SCALAR_VALUE && reg->precise)verbose (env,"P" );if (t ==SCALAR_VALUE &&tnum_is_const (reg->var_off))
tools/testing/selftests/bpf/prog_tests/align.c +109 -109
390 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/log_buf.c +2 -2
@@ -78,7 +78,7 @@ static void obj_load_log_buf(void)ASSERT_OK_PTR (strstr (libbpf_log_buf,"prog 'bad_prog': BPF program load failed" ),"libbpf_log_not_empty" );ASSERT_OK_PTR (strstr (obj_log_buf,"DATASEC license" ),"obj_log_not_empty" ); -ASSERT_OK_PTR (strstr (good_log_buf,"0: R1=ctx(id=0,off=0,imm=0) R10=fp0" ), +ASSERT_OK_PTR (strstr (good_log_buf,"0: R1=ctx(off=0,imm=0) R10=fp0" ),"good_log_verbose" );ASSERT_OK_PTR (strstr (bad_log_buf,"invalid access to map value, value_size=16 off=16000 size=4" ),"bad_log_not_empty" );
@@ -175,7 +175,7 @@ static void bpf_prog_load_log_buf(void) opts.log_level =2 ; fd =bpf_prog_load (BPF_PROG_TYPE_SOCKET_FILTER ,"good_prog" ,"GPL" , good_prog_insns, good_prog_insn_cnt, &opts); -ASSERT_OK_PTR (strstr (log_buf,"0: R1=ctx(id=0,off=0,imm=0) R10=fp0" ),"good_log_2" ); +ASSERT_OK_PTR (strstr (log_buf,"0: R1=ctx(off=0,imm=0) R10=fp0" ),"good_log_2" );ASSERT_GE (fd,0 ,"good_fd2" );if (fd >=0 )close (fd);
tools/testing/selftests/bpf/verifier/atomic_invalid.c +3 -3
@@ -1,6 +1,6 @@ -#define __INVALID_ATOMIC_ACCESS_TEST (op) \ +#define __INVALID_ATOMIC_ACCESS_TEST (op) \ { \ - "atomic " #op " access through non-pointer ", \ + "atomic " #op " access through non-pointer ", \ .insns = { \ BPF_MOV64_IMM(BPF_REG_0, 1), \ BPF_MOV64_IMM(BPF_REG_1, 0), \
@@ -9,7 +9,7 @@ BPF_EXIT_INSN(), \ }, \ .result = REJECT, \ - .errstr = "R1 invalid mem access 'inv'" \ + .errstr = "R1 invalid mem access 'scalar'" \ }__INVALID_ATOMIC_ACCESS_TEST (BPF_ADD ), __INVALID_ATOMIC_ACCESS_TEST(BPF_ADD | BPF_FETCH),
tools/testing/selftests/bpf/verifier/bounds.c +2 -2
@@ -508,7 +508,7 @@ BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, -1), BPF_EXIT_INSN(), }, - .errstr_unpriv = "R0 invalid mem access 'inv'", + .errstr_unpriv = "R0 invalid mem access 'scalar'", .result_unpriv = REJECT, .result =ACCEPT },
@@ -530,7 +530,7 @@ BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, -1), BPF_EXIT_INSN(), }, - .errstr_unpriv = "R0 invalid mem access 'inv'", + .errstr_unpriv = "R0 invalid mem access 'scalar'", .result_unpriv = REJECT, .result =ACCEPT },
tools/testing/selftests/bpf/verifier/calls.c +3 -3
@@ -169,7 +169,7 @@ }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, - .errstr = "R0 invalid mem access 'inv'", + .errstr = "R0 invalid mem access 'scalar'", }, { "calls: multiple ret types in subprog 2",
@@ -472,7 +472,7 @@ BPF_EXIT_INSN(), }, .result = REJECT, - .errstr = "R6 invalid mem access 'inv'", + .errstr = "R6 invalid mem access 'scalar'", .prog_type = BPF_PROG_TYPE_XDP, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
@@ -1678,7 +1678,7 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .fixup_map_hash_8b = { 12, 22 }, .result = REJECT, - .errstr = "R0 invalid mem access 'inv'", + .errstr = "R0 invalid mem access 'scalar'", }, { "calls: pkt_ptr spill into caller stack",
tools/testing/selftests/bpf/verifier/ctx.c +2 -2
@@ -127,7 +127,7 @@ .prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR, .expected_attach_type = BPF_CGROUP_UDP6_SENDMSG, .result = REJECT, - .errstr = "R1 type=inv expected=ctx", + .errstr = "R1 type=scalar expected=ctx", }, { "pass ctx or null check, 4: ctx - const",
@@ -193,5 +193,5 @@ .prog_type = BPF_PROG_TYPE_CGROUP_SOCK, .expected_attach_type = BPF_CGROUP_INET4_POST_BIND, .result = REJECT, - .errstr = "R1 type=inv expected=ctx", + .errstr = "R1 type=scalar expected=ctx", },
tools/testing/selftests/bpf/verifier/direct_packet_access.c +1 -1
@@ -339,7 +339,7 @@BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr ="R2 invalid mem access 'inv'" , + .errstr ="R2 invalid mem access 'scalar'" , .result = REJECT, .prog_type = BPF_PROG_TYPE_SCHED_CLS, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +3 -3
@@ -350,7 +350,7 @@BPF_EMIT_CALL (BPF_FUNC_csum_diff),BPF_EXIT_INSN (), }, - .errstr = "R1 type=inv expected=fp", + .errstr = "R1 type=scalar expected=fp", .result = REJECT, .prog_type = BPF_PROG_TYPE_SCHED_CLS, },
@@ -471,7 +471,7 @@BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel),BPF_EXIT_INSN (), }, - .errstr = "R1 type=inv expected=fp", + .errstr = "R1 type=scalar expected=fp", .result = REJECT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, },
@@ -484,7 +484,7 @@BPF_EMIT_CALL (BPF_FUNC_probe_read_kernel),BPF_EXIT_INSN (), }, - .errstr = "R1 type=inv expected=fp", + .errstr = "R1 type=scalar expected=fp", .result = REJECT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, },
tools/testing/selftests/bpf/verifier/jmp32.c +8 -8
@@ -286,7 +286,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -356,7 +356,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -426,7 +426,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -496,7 +496,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -566,7 +566,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -636,7 +636,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -706,7 +706,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
@@ -776,7 +776,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R0 invalid mem access 'inv'" , + .errstr_unpriv ="R0 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 2,
tools/testing/selftests/bpf/verifier/precise.c +2 -2
@@ -27,7 +27,7 @@BPF_JMP_IMM (BPF_JLT ,BPF_REG_2 ,8 ,1 ),BPF_EXIT_INSN (), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,1 ),/* R2=inv(umin=1, umax=8) */ +BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,1 ),/* R2=scalar(umin=1, umax=8) */ BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_FP ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 ,-8 ), BPF_MOV64_IMM(BPF_REG_3, 0),
@@ -87,7 +87,7 @@BPF_JMP_IMM (BPF_JLT ,BPF_REG_2 ,8 ,1 ),BPF_EXIT_INSN (), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,1 ),/* R2=inv(umin=1, umax=8) */ +BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,1 ),/* R2=scalar(umin=1, umax=8) */ BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_FP ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_1 ,-8 ), BPF_MOV64_IMM(BPF_REG_3, 0),
tools/testing/selftests/bpf/verifier/raw_stack.c +2 -2
@@ -132,7 +132,7 @@ BPF_EXIT_INSN(), }, .result = REJECT, - .errstr = "R0 invalid mem access 'inv'", + .errstr = "R0 invalid mem access 'scalar'", .prog_type = BPF_PROG_TYPE_SCHED_CLS, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
@@ -162,7 +162,7 @@ BPF_EXIT_INSN(), }, .result = REJECT, - .errstr = "R3 invalid mem access 'inv'", + .errstr = "R3 invalid mem access 'scalar'", .prog_type = BPF_PROG_TYPE_SCHED_CLS, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
tools/testing/selftests/bpf/verifier/ref_tracking.c +3 -3
@@ -162,7 +162,7 @@ BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .errstr = "type=inv expected=sock", + .errstr = "type=scalar expected=sock", .result = REJECT, }, {
@@ -178,7 +178,7 @@ BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .errstr = "type=inv expected=sock", + .errstr = "type=scalar expected=sock", .result = REJECT, }, {
@@ -274,7 +274,7 @@ BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .errstr = "type=inv expected=sock", + .errstr = "type=scalar expected=sock", .result = REJECT, }, {
tools/testing/selftests/bpf/verifier/search_pruning.c +1 -1
@@ -104,7 +104,7 @@ BPF_EXIT_INSN(), }, .fixup_map_hash_8b = { 3 }, - .errstr = "R6 invalid mem access 'inv'", + .errstr = "R6 invalid mem access 'scalar'", .result = REJECT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, },
tools/testing/selftests/bpf/verifier/sock.c +1 -1
@@ -502,7 +502,7 @@ .fixup_sk_storage_map = { 11 }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, - .errstr ="R3 type=inv expected=fp" , + .errstr ="R3 type=scalar expected=fp" , }, { "sk_storage_get(map, skb->sk, &stack_value, 1): stack_value",
tools/testing/selftests/bpf/verifier/spill_fill.c +19 -19
@@ -102,7 +102,7 @@ BPF_EXIT_INSN(), }, .errstr_unpriv = "attempt to corrupt spilled", - .errstr = "R0 invalid mem access 'inv", + .errstr = "R0 invalid mem access 'scalar'", .result = REJECT, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
@@ -147,11 +147,11 @@BPF_LDX_MEM (BPF_W ,BPF_REG_4 ,BPF_REG_10 ,-8 ),/* r0 = r2 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ), -/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=inv20 */ +/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=20 */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_0 ,BPF_REG_4 ), -/* if (r0 > r3) R0=pkt,off=20 R2=pkt R3=pkt_end R4=inv20 */ +/* if (r0 > r3) R0=pkt,off=20 R2=pkt R3=pkt_end R4=20 */ BPF_JMP_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_3 ,1 ), -/* r0 = *(u32 *)r2 R0=pkt,off=20,r=20 R2=pkt,r=20 R3=pkt_end R4=inv20 */ +/* r0 = *(u32 *)r2 R0=pkt,off=20,r=20 R2=pkt,r=20 R3=pkt_end R4=20 */ BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_2 ,0 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(),
@@ -190,11 +190,11 @@BPF_LDX_MEM (BPF_H ,BPF_REG_4 ,BPF_REG_10 ,-8 ),/* r0 = r2 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ), -/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_0 ,BPF_REG_4 ), -/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=umax=65535 */ BPF_JMP_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_3 ,1 ), -/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv20 */ +/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=20 */ BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_2 ,0 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(),
@@ -222,11 +222,11 @@BPF_LDX_MEM (BPF_H ,BPF_REG_4 ,BPF_REG_10 ,-8 ),/* r0 = r2 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ), -/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_0 ,BPF_REG_4 ), -/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=umax=65535 */ BPF_JMP_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_3 ,1 ), -/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv20 */ +/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=20 */ BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_2 ,0 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(),
@@ -250,11 +250,11 @@BPF_LDX_MEM (BPF_H ,BPF_REG_4 ,BPF_REG_10 ,-6 ),/* r0 = r2 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ), -/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_0 ,BPF_REG_4 ), -/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv,umax=65535 */ +/* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=umax=65535 */ BPF_JMP_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_3 ,1 ), -/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=inv20 */ +/* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=20 */ BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_2 ,0 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(),
@@ -280,11 +280,11 @@BPF_LDX_MEM (BPF_W ,BPF_REG_4 ,BPF_REG_10 ,-4 ),/* r0 = r2 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ), -/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=inv,umax=U32_MAX */ +/* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=U32_MAX */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_0 ,BPF_REG_4 ), -/* if (r0 > r3) R0=pkt,umax=U32_MAX R2=pkt R3=pkt_end R4=inv */ +/* if (r0 > r3) R0=pkt,umax=U32_MAX R2=pkt R3=pkt_end R4= */ BPF_JMP_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_3 ,1 ), -/* r0 = *(u32 *)r2 R0=pkt,umax=U32_MAX R2=pkt R3=pkt_end R4=inv */ +/* r0 = *(u32 *)r2 R0=pkt,umax=U32_MAX R2=pkt R3=pkt_end R4= */ BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_2 ,0 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(),
@@ -305,13 +305,13 @@BPF_JMP_IMM (BPF_JLE ,BPF_REG_4 ,40 ,2 ),BPF_MOV64_IMM (BPF_REG_0 ,0 ),BPF_EXIT_INSN (), -/* *(u32 *)(r10 -8) = r4 R4=inv,umax=40 */ +/* *(u32 *)(r10 -8) = r4 R4=umax=40 */ BPF_STX_MEM (BPF_W ,BPF_REG_10 ,BPF_REG_4 ,-8 ),/* r4 = (*u32 *)(r10 - 8) */ BPF_LDX_MEM (BPF_W ,BPF_REG_4 ,BPF_REG_10 ,-8 ), -/* r2 += r4 R2=pkt R4=inv,umax=40 */ +/* r2 += r4 R2=pkt R4=umax=40 */ BPF_ALU64_REG (BPF_ADD ,BPF_REG_2 ,BPF_REG_4 ), -/* r0 = r2 R2=pkt,umax=40 R4=inv,umax=40 */ +/* r0 = r2 R2=pkt,umax=40 R4=umax=40 */ BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_2 ),/* r2 += 20 R0=pkt,umax=40 R2=pkt,umax=40 */ BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, 20),
tools/testing/selftests/bpf/verifier/unpriv.c +2 -2
@@ -214,7 +214,7 @@ BPF_EXIT_INSN(), }, .result = REJECT, - .errstr = "R1 type=inv expected=ctx", + .errstr = "R1 type=scalar expected=ctx", .prog_type = BPF_PROG_TYPE_SCHED_CLS, }, {
@@ -420,7 +420,7 @@BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_7 ,0 ), BPF_EXIT_INSN(), }, - .errstr_unpriv ="R7 invalid mem access 'inv'" , + .errstr_unpriv ="R7 invalid mem access 'scalar'" , .result_unpriv = REJECT, .result = ACCEPT, .retval = 0,
tools/testing/selftests/bpf/verifier/value_illegal_alu.c +2 -2
@@ -64,7 +64,7 @@ }, .fixup_map_hash_48b = { 3 }, .errstr_unpriv = "R0 pointer arithmetic prohibited", - .errstr = "invalid mem access 'inv'", + .errstr = "invalid mem access 'scalar'", .result = REJECT, .result_unpriv = REJECT, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
@@ -89,7 +89,7 @@ }, .fixup_map_hash_48b = { 3 }, .errstr_unpriv = "leaking pointer from stack off -8", - .errstr = "R0 invalid mem access 'inv'", + .errstr = "R0 invalid mem access 'scalar'", .result = REJECT, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
tools/testing/selftests/bpf/verifier/value_ptr_arith.c +2 -2
@@ -397,7 +397,7 @@ .fixup_map_array_48b = { 1 }, .result = ACCEPT, .result_unpriv = REJECT, - .errstr_unpriv = "R0 invalid mem access 'inv'", + .errstr_unpriv = "R0 invalid mem access 'scalar'", .retval = 0, }, {
@@ -1074,7 +1074,7 @@ }, .fixup_map_array_48b = { 3 }, .result = REJECT, - .errstr = "R0 invalid mem access 'inv'", + .errstr = "R0 invalid mem access 'scalar'", .errstr_unpriv = "R0 pointer -= pointer prohibited", }, {
tools/testing/selftests/bpf/verifier/var_off.c +1 -1
@@ -131,7 +131,7 @@* write might have overwritten the spilled pointer (i.e. we lose track * of the spilled register when we analyze the write). */ - .errstr = "R2 invalid mem access 'inv'", + .errstr = "R2 invalid mem access 'scalar'", .result = REJECT, }, {
Signature · 1 line
2.30.2
Quoted 12 lines · Mykola Lysenko
tools/testing/selftests/bpf/prog_tests/align.c +0
-10.prog_type = BPF_PROG_TYPE_SCHED_CLS, .matches = { - {6, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"}, - {7, "R4_w=inv(id=1,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=1,umax_value=255,var_off=(0x0; 0xff))"}, - {10, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"}, - {11, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {12, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"}, - {13, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {14, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"}, - {15, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"},
tools/testing/selftests/bpf/prog_tests/align.c static struct bpf_align_test tests[] = { · line 206
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/align.c +10
-0+ {6, "R3_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {7, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {8, "R4_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {9, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {10, "R4_w=scalar(umax=510,var_off=(0x0; 0x1fe))"}, + {11, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {12, "R4_w=scalar(umax=1020,var_off=(0x0; 0x3fc))"}, + {13, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {14, "R4_w=scalar(umax=2040,var_off=(0x0; 0x7f8))"}, + {15, "R4_w=scalar(umax=4080,var_off=(0x0; 0xff0))"},
Sorry for the later review.
Would "int" be more precise and less verbose than "scalar"?
Daniel Borkmann
maintainerQuoted 18 lines · Alexei Starovoitov
Quoted 17 lines · Mykola Lysenko
.prog_type = BPF_PROG_TYPE_SCHED_CLS, .matches = {tools/testing/selftests/bpf/prog_tests/align.c +5
-10- {6, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"}, - {7, "R4_w=inv(id=1,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=1,umax_value=255,var_off=(0x0; 0xff))"}, - {10, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"}, - {11, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {12, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"}, - {13, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {14, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"}, - {15, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"}, + {6, "R3_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {7, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {8, "R4_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {9, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {10, "R4_w=scalar(umax=510,var_off=(0x0; 0x1fe))"},
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/align.c static struct bpf_align_test tests[] = { · line 206
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/align.c +5
-0+ {11, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {12, "R4_w=scalar(umax=1020,var_off=(0x0; 0x3fc))"}, + {13, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {14, "R4_w=scalar(umax=2040,var_off=(0x0; 0x7f8))"}, + {15, "R4_w=scalar(umax=4080,var_off=(0x0; 0xff0))"},Sorry for the later review.
Would "int" be more precise and less verbose than "scalar"?
Could work as well, although in many places today we make use of the term "scalar", so developers might be more familiar with it (and more consistent towards the verifier type internals).
Thanks,
Daniel
Quoted 26 lines · Daniel Borkmann
Quoted 24 lines · Alexei Starovoitov
Quoted 22 lines · Mykola Lysenko
.prog_type =
BPF_PROG_TYPE_SCHED_CLS, .matches = {tools/testing/selftests/bpf/prog_tests/align.c +10
-10- {6, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"}, - {7, "R4_w=inv(id=1,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=1,umax_value=255,var_off=(0x0; 0xff))"}, - {10, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"}, - {11, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {12, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"}, - {13, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {14, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"}, - {15, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"}, + {6, "R3_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {7, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {8, "R4_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {9, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {10, "R4_w=scalar(umax=510,var_off=(0x0; 0x1fe))"}, + {11, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {12, "R4_w=scalar(umax=1020,var_off=(0x0; 0x3fc))"}, + {13, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {14, "R4_w=scalar(umax=2040,var_off=(0x0; 0x7f8))"}, + {15, "R4_w=scalar(umax=4080,var_off=(0x0; 0xff0))"},
Quoted 6 lines
Quoted 2 lines
Sorry for the later review.
Would "int" be more precise and less verbose than "scalar"?Could work as well, although in many places today we make use of the term "scalar", so developers might be more familiar with it (and more consistent towards the verifier type internals).
I was focusing more on users who will see these logs and
would have to interpret them.
I suspect the ratio is 1 developer to 1000 users.
The users have to fight the verifier quite a bit to make the program pass. I was thinking about "i64" too. That's what llvm is using,
but it's less clear than "int", which should be obvious
for users since they write progs in C.
It's also shorter.
I can live with "scalar" though.
Daniel Borkmann
maintainerQuoted 42 lines · Alexei Starovoitov
Quoted 25 lines · Daniel Borkmann
Quoted 24 lines · Alexei Starovoitov
Quoted 22 lines · Mykola Lysenko
.prog_type =
BPF_PROG_TYPE_SCHED_CLS, .matches = {tools/testing/selftests/bpf/prog_tests/align.c +10
-10- {6, "R3_w=inv(id=0,umax_value=255,var_off=(0x0; 0xff))"}, - {7, "R4_w=inv(id=1,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=1,umax_value=255,var_off=(0x0; 0xff))"}, - {10, "R4_w=inv(id=0,umax_value=510,var_off=(0x0; 0x1fe))"}, - {11, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {12, "R4_w=inv(id=0,umax_value=1020,var_off=(0x0; 0x3fc))"}, - {13, "R4_w=inv(id=1,umax_value=255,var_off=(0x0; 0xff))"}, - {14, "R4_w=inv(id=0,umax_value=2040,var_off=(0x0; 0x7f8))"}, - {15, "R4_w=inv(id=0,umax_value=4080,var_off=(0x0; 0xff0))"}, + {6, "R3_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {7, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {8, "R4_w=scalar(umax=255,var_off=(0x0; 0xff))"}, + {9, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {10, "R4_w=scalar(umax=510,var_off=(0x0; 0x1fe))"}, + {11, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {12, "R4_w=scalar(umax=1020,var_off=(0x0; 0x3fc))"}, + {13, "R4_w=scalar(id=1,umax=255,var_off=(0x0; 0xff))"}, + {14, "R4_w=scalar(umax=2040,var_off=(0x0; 0x7f8))"}, + {15, "R4_w=scalar(umax=4080,var_off=(0x0; 0xff0))"},Quoted 6 lines
Quoted 2 lines
Sorry for the later review.
Would "int" be more precise and less verbose than "scalar"?Could work as well, although in many places today we make use of the term "scalar", so developers might be more familiar with it (and more consistent towards the verifier type internals).
I was focusing more on users who will see these logs and
would have to interpret them.
I suspect the ratio is 1 developer to 1000 users.
The users have to fight the verifier quite a bit to make the program pass. I was thinking about "i64" too. That's what llvm is using,
but it's less clear than "int", which should be obvious
for users since they write progs in C.
It's also shorter.
Quoted 1 line
I can live with "scalar" though.
Imho, 'scalar' fits best. 'i64' would still be better then 'int' as it could imply different width. Anyway, can push it out in a bit.