bpf: Fix loop detection for re-arming async callbacks
Subsystems (3)
cover bpf: Fix loop detection for re-arming async callbacks
is_state_visited() skips the infinite loop check when two states differ in async_entry_cnt, since seeing the same state on a second entry into an async callback is not a loop. It reads that from the innermost frame, but push_async_cb() sets in_async_callback_fn and async_entry_cnt on the callback's own frame, and setup_func_entry() copies neither, so a subprog called by the callback carries neither.
A callback which re-arms itself and calls a subprog therefore has its two entries compared at a loop inside that subprog, and is rejected:
infinite loop detected at insn 57
Patch 1 reads both from frame 0, which push_async_cb() makes the callback's frame at any call depth.
Patch 2 covers both directions: a timer callback which re-arms through bpf_timer_set_callback() and reaches a bounded loop through a static subprog, which fails to load without patch 1, and a callback which never returns, which must still be rejected either way. Nothing covered an async callback before, so neither direction was tested.
Puranjay Mohan (2):
bpf: Look at frame 0 when telling async callback entries apart selftests/bpf: Add timer tests for a re-arming callback with a loop
kernel/bpf/states.c | 4 +- .../testing/selftests/bpf/prog_tests/timer.c | 33 ++++++++++++ tools/testing/selftests/bpf/progs/timer.c | 50 ++++++++++++++++++- .../selftests/bpf/progs/timer_failure.c | 29 +++++++++++ 4 files changed, 113 insertions(+), 3 deletions(-)
base-commit: 91f8613d95ad8cd99d8baf094806d1ef98bc6380
Signature · 1 line
2.53.0-Meta
PATCH 1/2 bpf: Look at frame 0 when telling async callback entries apart
is_state_visited() skips the infinite loop check when two states differ in async_entry_cnt, because seeing the same state on a second entry into an async callback is not a loop. It reads that from the innermost frame, but push_async_cb() sets in_async_callback_fn and async_entry_cnt on the callback's own frame, and setup_func_entry() copies neither, so a subprog called by the callback carries neither.
A callback which re-arms itself and calls a subprog therefore compares the two entries at a loop inside that subprog, where the innermost frame is the subprog's, and the state is rejected:
infinite loop detected at insn 60
Read the flag and the count from frame 0, which push_async_cb() makes the callback's frame. A loop within a single entry still has a matching count and is still caught, and frame 0 of a non-async state does not have the flag set, so nothing else changes.
--- kernel/bpf/states.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/states.c +2 -2
@@ -1273,10 +1273,10 @@ int bpf_is_state_visited(struct bpf_verifier_env *env, int insn_idx)continue ;if (sl->state.branches) { -struct bpf_func_state *frame = sl->state.frame[sl->state.curframe]; +struct bpf_func_state *frame = sl->state.frame[0 ];if (frame->in_async_callback_fn && - frame->async_entry_cnt != cur->frame[cur->curframe]->async_entry_cnt) { + frame->async_entry_cnt != cur->frame[0 ]->async_entry_cnt) {/* Different async_entry_cnt means that the verifier is * processing another entry into async callback. * Seeing the same state is not an indication of infinite
Signature · 1 line
2.53.0-Meta
Re: [PATCH bpf-next 1/2] bpf: Look at frame 0 when telling async callback entries apart
kernel/bpf/states.c int bpf_is_state_visited(struct bpf_verifier_env *env, int insn_idx) · line 1279
Quoted 6 lines · Puranjay Mohan
kernel/bpf/states.c +2
-2-struct bpf_func_state *frame = sl->state.frame[sl->state.curframe]; +struct bpf_func_state *frame = sl->state.frame[0 ];if (frame->in_async_callback_fn && - frame->async_entry_cnt != cur->frame[cur->curframe]->async_entry_cnt) { + frame->async_entry_cnt != cur->frame[0 ]->async_entry_cnt) {
push_callback_call() has the same problem:
caller = state->frame[state->curframe];
...
callee->async_entry_cnt = caller->async_entry_cnt + 1;
When the callback re-arms itself from a subprog the caller is frame 1 with async_entry_cnt == 0, so every entry into the callback gets async_entry_cnt == 1 and the check above never skips. A loop anywhere in such callback is still rejected with "infinite loop detected".
pw-bot: cr
PATCH 2/2 selftests/bpf: Add timer tests for a re-arming callback with a loop
In reply to Puranjay MohanExisting timer callbacks either do not re-arm through bpf_timer_set_callback(), which is what starts another async callback entry, or do not reach a loop once they do. Cover that: loop_cb() re-arms itself and reaches a bounded loop through sum_to(), which is static and not inlined, so the loop is walked in a frame below the callback's rather than in a separately verified global subprog. Without the preceding fix the program is rejected with "infinite loop detected".
Telling async callback entries apart must not stop the verifier catching a real loop in a callback, and no existing test covers that either, so also check that a callback which never returns is still rejected.
--- .../testing/selftests/bpf/prog_tests/timer.c | 33 ++++++++++++ tools/testing/selftests/bpf/progs/timer.c | 50 ++++++++++++++++++- .../selftests/bpf/progs/timer_failure.c | 29 +++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/timer.c +33 -0
@@ -262,6 +262,34 @@ static int timer_cancel_async(struct timer *timer_skel)return 0 ; } +/* +* A timer callback which re-arms itself and reaches a loop through a call: +* the two entries into the callback meet at the loop, in a frame of its own. +*/ +static int timer_loop_rearm (struct timer *timer_skel) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +int err, prog_fd, i; + + err =timer__attach (timer_skel); +if (!ASSERT_OK (err,"timer_attach" )) +return err; + + timer_skel->bss->loop_rearm =1 ; + + prog_fd =bpf_program__fd (timer_skel->progs.test_loop_rearm); + err =bpf_prog_test_run_opts (prog_fd, &topts); +if (!ASSERT_OK (err,"test_run" )) +return err; + +for (i =0 ; i <100 && timer_skel->bss->loop_sum <120 *2 ; i++) +usleep (1000 ); + +timer__detach (timer_skel); +ASSERT_EQ (timer_skel->bss->loop_sum,120 *2 ,"loop_sum" ); +return 0 ; +} +static void test_timer (int (*timer_test_fn)(struct timer *timer_skel)) {struct timer *timer_skel =NULL ;
@@ -287,6 +315,11 @@ void serial_test_timer(void)RUN_TESTS (timer_failure); } +void serial_test_timer_loop_rearm (void ) +{ +test_timer (timer_loop_rearm); +} +void serial_test_timer_stress (void ) {test_timer (timer_stress);
tools/testing/selftests/bpf/progs/timer.c +49 -1
70 lines not on this page · raw message
tools/testing/selftests/bpf/progs/timer_failure.c +29 -0
@@ -66,3 +66,32 @@ long BPF_PROG2(test_bad_ret, int, a)return 0 ; } + +/* +* A real loop inside an async callback must still be rejected: both entries +* into the callback have the same async_entry_cnt, so telling entries apart +* does not apply here. +*/ +static int timer_cb_infinite_loop (void *map,int *key,struct elem *val) +{ +for (;;) {} + +return 0 ; +} + +SEC("fentry/bpf_fentry_test1") +__failure __msg("infinite loop detected") +long BPF_PROG2(test_infinite_loop_cb, int, a) +{ +struct bpf_timer *timer; +int key =0 ; + + timer =bpf_map_lookup_elem (&timer_map, &key); +if (timer) { +bpf_timer_init (timer, &timer_map,CLOCK_BOOTTIME ); +bpf_timer_set_callback (timer, timer_cb_infinite_loop); +bpf_timer_start (timer,1000 ,0 ); + } + +return 0 ; +}
Signature · 1 line
2.53.0-Meta