History

bpf: change bpf_perf_event_output arg5 type to ARG_CONST_SIZE_OR_ZERO

Commit 9fd29c08e520 ("bpf: improve verifier ARG_CONST_SIZE_OR_ZERO semantics") relaxed the treatment of ARG_CONST_SIZE_OR_ZERO due to the way the compiler generates optimized BPF code when checking boundaries of an argument from C code. A typical example of this optimized code can be generated using the bpf_perf_event_output helper when operating on variable memory: /* len is a generic scalar */ if (len > 0 && len <= 0x7fff) bpf_perf_event_output(ctx, &perf_map, 0, buf, len); 110: (79) r5 = *(u64 *)(r10 -40) 111: (bf) r1 = r5 112: (07) r1 += -1 113: (25) if r1 > 0x7ffe goto pc+6 114: (bf) r1 = r6 115: (18) r2 = 0xffff94e5f166c200 117: (b7) r3 = 0 118: (bf) r4 = r7 119: (85) call bpf_perf_event_output#25 R5 min value is negative, either use unsigned or 'var &= const' With this code, the verifier loses track of the variable. Replacing arg5 with ARG_CONST_SIZE_OR_ZERO is thus desirable since it avoids this quite common case which leads to usability issues, and the compiler generates code that the verifier can more easily test: if (len <= 0x7fff) bpf_perf_event_output(ctx, &perf_map, 0, buf, len); or bpf_perf_event_output(ctx, &perf_map, 0, buf, len & 0x7fff); No changes to the bpf_perf_event_output helper are necessary since it can handle a case where size is 0, and an empty frame is pushed.

Gianluca Borello committed 8 years ago

Commit a60dd351 parent 5c4e1201 file · +2 −2Browse files

Unified · Split

kernel/trace/bpf_trace.c+2−2
@@ -403,7 +403,7 @@ static const struct bpf_func_proto bpf_perf_event_output_proto = { · 402 unmodified lines
403403 .arg2_type = ARG_CONST_MAP_PTR,
404404 .arg3_type = ARG_ANYTHING,
405405 .arg4_type = ARG_PTR_TO_MEM,
406− .arg5_type = ARG_CONST_SIZE,
406+ .arg5_type = ARG_CONST_SIZE_OR_ZERO,
407407 };
408408
409409 static DEFINE_PER_CPU(struct pt_regs, bpf_pt_regs);
@@ -605,7 +605,7 @@ static const struct bpf_func_proto bpf_perf_event_output_proto_tp = { · 195 unmodified lines
605605 .arg2_type = ARG_CONST_MAP_PTR,
606606 .arg3_type = ARG_ANYTHING,
607607 .arg4_type = ARG_PTR_TO_MEM,
608− .arg5_type = ARG_CONST_SIZE,
608+ .arg5_type = ARG_CONST_SIZE_OR_ZERO,
609609 };
610610
611611 BPF_CALL_3(bpf_get_stackid_tp, void *, tp_buff, struct bpf_map *, map,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t