From: Mykyta Yatsenko Once the stack walk reaches a NULL frame pointer, the remaining loop iterations do nothing, but the path keeps coming back to the loop head with a precise NULL frame_ptr that can't cover the paths still walking the stack. If the verifier reaches the loop head with that state first, as it does with an LLVM change that lets the BPF backend reorder conditional branches, pyperf600_nounroll hits the 1M instruction limit. Break out of the loop instead: before: for (...) { if (frame_ptr) { ... frame_ptr = next; } } after: for (...) { if (!frame_ptr) break; ... frame_ptr = next; } Verified insns/states, before -> after (fail: 1M insn limit): current LLVM: pyperf600_nounroll v3 466200/21935 -> 423469/10769 pyperf600_nounroll v4 460049/21941 -> 423390/10768 pyperf600 v3 258015/16635 -> 235130/9485 pyperf600 v4 255429/16630 -> 241749/9484 pyperf180 v3 74395/5510 -> 61405/3705 pyperf180 v4 83077/6310 -> 63528/4601 pyperf100 v3 43400/3216 -> 35535/2408 pyperf100 v4 42437/3216 -> 35901/2600 pyperf50 v3 19218/1384 -> 18535/1258 pyperf50 v4 19180/1411 -> 18570/1347 pyperf_subprogs v3 19288/1358 -> 19548/1351 pyperf_subprogs v4 18472/1341 -> 18648/1355 pyperf_global v3 3926/276 -> 3963/275 pyperf_global v4 3802/276 -> 3778/276 pyperf600_iter v3 2343/170 -> 2352/177 pyperf600_iter v4 2249/171 -> 2278/177 patched LLVM [1]: pyperf600_nounroll v3 fail -> 339856/15914 pyperf600_nounroll v4 fail -> 339634/15892 pyperf600 v3 258015/16635 -> 235130/9485 pyperf600 v4 400649/24467 -> 241679/9460 pyperf180 v3 74395/5510 -> 61405/3705 pyperf180 v4 77259/6130 -> 68618/5484 pyperf100 v3 43400/3216 -> 35535/2408 pyperf100 v4 44529/3580 -> 38618/3084 pyperf50 v3 22475/1849 -> 20436/1584 pyperf50 v4 21957/1849 -> 19868/1584 pyperf_subprogs v3 21628/1922 -> 20529/1578 pyperf_subprogs v4 21048/1920 -> 19952/1578 pyperf_global v3 4303/388 -> 4150/320 pyperf_global v4 4231/388 -> 4027/320 pyperf600_iter v3 2229/167 -> 2534/180 pyperf600_iter v4 2143/163 -> 2451/181 Signed-off-by: Mykyta Yatsenko --- tools/testing/selftests/bpf/progs/pyperf.h | 32 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/pyperf.h b/tools/testing/selftests/bpf/progs/pyperf.h index fd93a96e5901..5f093bcf6b58 100644 --- a/tools/testing/selftests/bpf/progs/pyperf.h +++ b/tools/testing/selftests/bpf/progs/pyperf.h @@ -320,21 +320,25 @@ int __on_event(struct bpf_raw_tracepoint_args *ctx) #else /* !USE_ITER */ for (int i = 0; i < STACK_MAX_LEN; ++i) { #endif - if (frame_ptr && get_frame_data(frame_ptr, pidData, &frame, &sym)) { - int32_t new_symbol_id = *symbol_counter * 64 + cur_cpu; - int32_t *symbol_id = bpf_map_lookup_elem(&symbolmap, &sym); - if (!symbol_id) { - bpf_map_update_elem(&symbolmap, &sym, &zero, 0); - symbol_id = bpf_map_lookup_elem(&symbolmap, &sym); - if (!symbol_id) - return 0; - } - if (*symbol_id == new_symbol_id) - (*symbol_counter)++; - event->stack[i] = *symbol_id; - event->stack_len = i + 1; - frame_ptr = frame.f_back; + int32_t new_symbol_id, *symbol_id; + + /* stop at the end of the stack or at an unreadable frame */ + if (!frame_ptr || !get_frame_data(frame_ptr, pidData, &frame, &sym)) + break; + + new_symbol_id = *symbol_counter * 64 + cur_cpu; + symbol_id = bpf_map_lookup_elem(&symbolmap, &sym); + if (!symbol_id) { + bpf_map_update_elem(&symbolmap, &sym, &zero, 0); + symbol_id = bpf_map_lookup_elem(&symbolmap, &sym); + if (!symbol_id) + return 0; } + if (*symbol_id == new_symbol_id) + (*symbol_counter)++; + event->stack[i] = *symbol_id; + event->stack_len = i + 1; + frame_ptr = frame.f_back; } #endif /* USE_BPF_LOOP */ event->stack_complete = frame_ptr == NULL; -- 2.53.0-Meta