bpf: provide better register bounds after jmp32 instructions
Subsystems (4)
v2 cover bpf: provide better register bounds after jmp32 instructions
With latest llvm, bpf selftest test_progs, which has +alu32 enabled, failed for strobemeta.o and a few other subtests. The reason is due to that verifier did not provide better var_off.mask after jmp32 instructions. This patch set addressed this issue and after the fix, test_progs passed with alu32.
Patch #1 provided detailed explanation of the problem and the fix. Patch #2 added three tests in test_verifier.
Changelog:
v1 -> v2:
- do not directly manipulate tnum.{value,mask} in __reg_bound_offset32(), using tnum_lshift/tnum_rshift functions instead
- do __reg_bound_offset32() after regular 64bit __reg_bound_offset() since the latter may give a better upper 32bit var_off, which can be inherited by __reg_bound_offset32().
Yonghong Song (2):
bpf: provide better register bounds after jmp32 instructions tools/bpf: add verifier tests for better jmp32 register bounds
kernel/bpf/verifier.c | 19 +++++ tools/testing/selftests/bpf/verifier/jmp32.c | 83 ++++++++++++++++++++ 2 files changed, 102 insertions(+)
Signature · 1 line
2.17.1
PATCH v2 1/2 bpf: provide better register bounds after jmp32 instructions
With latest llvm (trunk https://github.com/llvm/llvm-project),test_progs, which has +alu32 enabled, failed for strobemeta.o. The verifier output looks like below with edit to replace large decimal numbers with hex ones.
193: (85) call bpf_probe_read_user_str#114
R0=inv(id=0)
194: (26) if w0 > 0x1 goto pc+4
R0_w=inv(id=0,umax_value=0xffffffff00000001)
195: (6b) *(u16 *)(r7 +80) = r0
196: (bc) w6 = w0
R6_w=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
197: (67) r6 <<= 32
R6_w=inv(id=0,smax_value=0x7fffffff00000000,umax_value=0xffffffff00000000,
var_off=(0x0; 0xffffffff00000000))
198: (77) r6 >>= 32
R6=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
201: (79) r8 = *(u64 *)(r10 -416)
R8_w=map_value(id=0,off=40,ks=4,vs=13872,imm=0)
202: (0f) r8 += r6
R8_w=map_value(id=0,off=40,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
203: (07) r8 += 9696
R8_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
255: (bf) r1 = r8
R1_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
257: (85) call bpf_probe_read_user_str#114
R1 unbounded memory access, make sure to bounds check any array access into a map
The value range for register r6 at insn 198 should be really just 0/1. The umax_value=0xffffffff caused later verification failure.
After jmp instructions, the current verifier already tried to use just obtained information to get better register range. The current mechanism is for 64bit register only. This patch implemented to tighten the range for 32bit sub-registers after jmp32 instructions.
With the patch, we have the below range ranges for the
above code sequence:
193: (85) call bpf_probe_read_user_str#114
R0=inv(id=0)
194: (26) if w0 > 0x1 goto pc+4
R0_w=inv(id=0,smax_value=0x7fffffff00000001,umax_value=0xffffffff00000001,
var_off=(0x0; 0xffffffff00000001))
195: (6b) *(u16 *)(r7 +80) = r0
196: (bc) w6 = w0
R6_w=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0x1))
197: (67) r6 <<= 32
R6_w=inv(id=0,umax_value=0x100000000,var_off=(0x0; 0x100000000))
198: (77) r6 >>= 32
R6=inv(id=0,umax_value=1,var_off=(0x0; 0x1))
...
201: (79) r8 = *(u64 *)(r10 -416)
R8_w=map_value(id=0,off=40,ks=4,vs=13872,imm=0)
202: (0f) r8 += r6
R8_w=map_value(id=0,off=40,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
203: (07) r8 += 9696
R8_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
...
255: (bf) r1 = r8
R1_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
...
257: (85) call bpf_probe_read_user_str#114
...
At insn 194, the register R0 has better var_off.mask and smax_value. Especially, the var_off.mask ensures later lshift and rshift maintains proper value range.
--- kernel/bpf/verifier.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
kernel/bpf/verifier.c +19 -0
@@ -1007,6 +1007,17 @@ static void __reg_bound_offset(struct bpf_reg_state *reg) reg->umax_value)); } +static void __reg_bound_offset32 (struct bpf_reg_state *reg) +{ +u64 mask =0xffffFFFF ; +struct tnum range =tnum_range (reg->umin_value & mask, + reg->umax_value & mask); +struct tnum lo32 =tnum_cast (reg->var_off,4 ); +struct tnum hi32 =tnum_lshift (tnum_rshift (reg->var_off,32 ),32 ); + + reg->var_off =tnum_or (hi32,tnum_intersect (lo32, range)); +} +/* Reset the min/max bounds of a register */ static void __mark_reg_unbounded (struct bpf_reg_state *reg) {
@@ -5589,6 +5600,10 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); +if (is_jmp32) { +__reg_bound_offset32 (false_reg); +__reg_bound_offset32 (true_reg); + }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.
@@ -5698,6 +5713,10 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); +if (is_jmp32) { +__reg_bound_offset32 (false_reg); +__reg_bound_offset32 (true_reg); + }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.
Signature · 1 line
2.17.1
PATCH v2 2/2 tools/bpf: add verifier tests for better jmp32 register bounds
In reply to Yonghong SongThree test cases are added.
Test 1: jmp32 'reg op imm'.
Test 2: jmp32 'reg op reg' where dst 'reg' has unknown constant
and src 'reg' has known constant
Test 3: jmp32 'reg op reg' where dst 'reg' has known constant
and src 'reg' has unknown constant
--- tools/testing/selftests/bpf/verifier/jmp32.c | 83 ++++++++++++++++++++ 1 file changed, 83 insertions(+)
tools/testing/selftests/bpf/verifier/jmp32.c +83 -0
@@ -744,3 +744,86 @@ .result = ACCEPT, .retval = 2, }, +{ + "jgt32: range bound deduction, reg op imm", + .insns = { +BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_1 ), +BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ), +BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ), +BPF_LD_MAP_FD (BPF_REG_1 ,0 ), +BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_JMP_IMM (BPF_JEQ ,BPF_REG_0 ,0 ,9 ), +BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_8 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_0 ), +BPF_EMIT_CALL (BPF_FUNC_get_cgroup_classid), +BPF_JMP32_IMM (BPF_JGT ,BPF_REG_0 ,1 ,5 ), +BPF_MOV32_REG (BPF_REG_6 ,BPF_REG_0 ), +BPF_ALU64_IMM (BPF_LSH ,BPF_REG_6 ,32 ), +BPF_ALU64_IMM (BPF_RSH ,BPF_REG_6 ,32 ), +BPF_ALU64_REG (BPF_ADD ,BPF_REG_8 ,BPF_REG_6 ), +BPF_ST_MEM (BPF_B ,BPF_REG_8 ,0 ,0 ), +BPF_MOV32_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_SCHED_CLS , + .fixup_map_hash_48b = { 4 }, + .result = ACCEPT, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, +}, +{ +"jgt32: range bound deduction, reg1 op reg2, reg1 unknown" , + .insns = { +BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_1 ), +BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ), +BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ), +BPF_LD_MAP_FD (BPF_REG_1 ,0 ), +BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_JMP_IMM (BPF_JEQ ,BPF_REG_0 ,0 ,10 ), +BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_8 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_0 ), +BPF_EMIT_CALL (BPF_FUNC_get_cgroup_classid), +BPF_MOV32_IMM (BPF_REG_2 ,1 ), +BPF_JMP32_REG (BPF_JGT ,BPF_REG_0 ,BPF_REG_2 ,5 ), +BPF_MOV32_REG (BPF_REG_6 ,BPF_REG_0 ), +BPF_ALU64_IMM (BPF_LSH ,BPF_REG_6 ,32 ), +BPF_ALU64_IMM (BPF_RSH ,BPF_REG_6 ,32 ), +BPF_ALU64_REG (BPF_ADD ,BPF_REG_8 ,BPF_REG_6 ), +BPF_ST_MEM (BPF_B ,BPF_REG_8 ,0 ,0 ), +BPF_MOV32_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_SCHED_CLS , + .fixup_map_hash_48b = { 4 }, + .result = ACCEPT, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, +}, +{ +"jle32: range bound deduction, reg1 op reg2, reg2 unknown" , + .insns = { +BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_1 ), +BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ), +BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ), +BPF_LD_MAP_FD (BPF_REG_1 ,0 ), +BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_JMP_IMM (BPF_JEQ ,BPF_REG_0 ,0 ,10 ), +BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_8 ), +BPF_MOV64_REG (BPF_REG_8 ,BPF_REG_0 ), +BPF_EMIT_CALL (BPF_FUNC_get_cgroup_classid), +BPF_MOV32_IMM (BPF_REG_2 ,1 ), +BPF_JMP32_REG (BPF_JLE ,BPF_REG_2 ,BPF_REG_0 ,5 ), +BPF_MOV32_REG (BPF_REG_6 ,BPF_REG_0 ), +BPF_ALU64_IMM (BPF_LSH ,BPF_REG_6 ,32 ), +BPF_ALU64_IMM (BPF_RSH ,BPF_REG_6 ,32 ), +BPF_ALU64_REG (BPF_ADD ,BPF_REG_8 ,BPF_REG_6 ), +BPF_ST_MEM (BPF_B ,BPF_REG_8 ,0 ,0 ), +BPF_MOV32_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_SCHED_CLS , + .fixup_map_hash_48b = { 4 }, + .result = ACCEPT, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, +},
Signature · 1 line
2.17.1
Quoted 10 lines · Yonghong Song
With latest llvm, bpf selftest
test_progs, which has +alu32 enabled, failed for strobemeta.o and a few other subtests. The reason is due to that verifier did not provide better var_off.mask after jmp32 instructions. This patch set addressed this issue and after the fix,test_progspassed with alu32.Patch #1 provided detailed explanation of the problem and the fix. Patch #2 added three tests in
test_verifier.
Quoted 7 lines
Changelog:
v1 -> v2:
- do not directly manipulate tnum.{value,mask} in__reg_bound_offset32(), using tnum_lshift/tnum_rshift functions instead
- do__reg_bound_offset32()after regular 64bit__reg_bound_offset()since the latter may give a better upper 32bitvar_off, which can be inherited by__reg_bound_offset32().
I fixed white space damage and adjusted subject line of patch 2. And applied to bpf-next. Thanks