Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Check for timeout in perf_link test

Recently perf_link test started unreliably failing on libbpf CI:
* https://github.com/libbpf/libbpf/actions/runs/11260672407/job/31312405473
* https://github.com/libbpf/libbpf/actions/runs/11260992334/job/31315514626
* https://github.com/libbpf/libbpf/actions/runs/11263162459/job/31320458251

Part of the test is running a dummy loop for a while and then checking
for a counter incremented by the test program.

Instead of waiting for an arbitrary number of loop iterations once,
check for the test counter in a loop and use get_time_ns() helper to
enforce a 100ms timeout.

v1: https://lore.kernel.org/bpf/zuRd072x9tumn2iN4wDNs5av0nu5nekMNV4PkR-YwCT10eFFTrUtZBRkLWFbrcCe7guvLStGQlhibo8qWojCO7i2-NGajes5GYIyynexD-w=@pm.me/

Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241011153104.249800-1-ihor.solodrai@pm.me

authored by

Ihor Solodrai and committed by
Andrii Nakryiko
e6c209da 82370ed5

+13 -2
+13 -2
tools/testing/selftests/bpf/prog_tests/perf_link.c
··· 4 4 #include <pthread.h> 5 5 #include <sched.h> 6 6 #include <test_progs.h> 7 + #include "testing_helpers.h" 7 8 #include "test_perf_link.skel.h" 9 + 10 + #define BURN_TIMEOUT_MS 100 11 + #define BURN_TIMEOUT_NS BURN_TIMEOUT_MS * 1000000 8 12 9 13 static void burn_cpu(void) 10 14 { ··· 36 32 int run_cnt_before, run_cnt_after; 37 33 struct bpf_link_info info; 38 34 __u32 info_len = sizeof(info); 35 + __u64 timeout_time_ns; 39 36 40 37 /* create perf event */ 41 38 memset(&attr, 0, sizeof(attr)); ··· 68 63 ASSERT_GT(info.prog_id, 0, "link_prog_id"); 69 64 70 65 /* ensure we get at least one perf_event prog execution */ 71 - burn_cpu(); 72 - ASSERT_GT(skel->bss->run_cnt, 0, "run_cnt"); 66 + timeout_time_ns = get_time_ns() + BURN_TIMEOUT_NS; 67 + while (true) { 68 + burn_cpu(); 69 + if (skel->bss->run_cnt > 0) 70 + break; 71 + if (!ASSERT_LT(get_time_ns(), timeout_time_ns, "run_cnt_timeout")) 72 + break; 73 + } 73 74 74 75 /* perf_event is still active, but we close link and BPF program 75 76 * shouldn't be executed anymore