When running BPF selftests on underlying hardware that lacks specific execution extensions (such as BPF Arena support), loading certain test skeletons failed, logging unexpected failures instead of declaring them as skipped. Manually hardcoding a skip list of subtest names inside the prog_tests runner files is fragile and prone to silent omission when new subtests are appended to the skeleton. Add a `skip` field to `struct test_loader` along with a `SKIP_TESTS()` macro (mirroring `RUN_TESTS()`) so test runners can iterate through and mark all subtests in a skeleton as skipped. Signed-off-by: Tiezhu Yang --- tools/testing/selftests/bpf/test_loader.c | 5 +++++ tools/testing/selftests/bpf/test_progs.h | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c index d24e4fedae46..b5e85bb627d3 100644 --- a/tools/testing/selftests/bpf/test_loader.c +++ b/tools/testing/selftests/bpf/test_loader.c @@ -1374,6 +1374,11 @@ void run_subtest(struct test_loader *tester, if (!test__start_subtest_with_desc(subspec->name, subspec->description)) return; + if (tester->skip) { + test__skip(); + return; + } + if (spec->skip_reason) { printf("%s:SKIP: %s\n", __func__, spec->skip_reason); test__skip(); diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index adc18f5eceb6..89572c762b57 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -530,6 +530,7 @@ struct test_loader { pre_execution_cb pre_execution_cb; struct bpf_object *obj; + bool skip; }; static inline void test_loader__set_pre_execution_cb(struct test_loader *tester, @@ -553,6 +554,13 @@ extern void test_loader_fini(struct test_loader *tester); test_loader_fini(&tester); \ }) +#define SKIP_TESTS(skel) ({ \ + struct test_loader tester = { .skip = true }; \ + \ + test_loader__run_subtests(&tester, #skel, skel##__elf_bytes); \ + test_loader_fini(&tester); \ +}) + struct expect_msg { const char *substr; /* substring match */ regex_t regex; -- 2.42.0