hi, I noticed several times in discussions that we should move test kfuncs into kernel module, now perhaps even more pressing with all the kfunc effort. This patchset moves all the test kfuncs into bpf_testmod. I added bpf_testmod/bpf_testmod_kfunc.h header that is shared between bpf_testmod kernel module and BPF programs, which brings some difficulties with __ksym define. But I'm not sure having separate headers for BPF programs and for kernel module would be better. This patchset also needs: 74bc3a5acc82 bpf: Add missing btf_put to register_btf_id_dtor_kfuncs which is only in bpf/master now. thanks, jirka --- Jiri Olsa (5): selftests/bpf: Move kfunc exports to bpf_testmod/bpf_testmod_kfunc.h selftests/bpf: Move test_progs helpers to testing_helpers object selftests/bpf: Load bpf_testmod for verifier test selftests/bpf: Allow to use kfunc from testmod.ko in test_verifier bpf: Move kernel test kfuncs to bpf_testmod net/bpf/test_run.c | 253 +------------------------------------------------------------------------------------------ tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 89 ++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/cb_refs.c | 1 + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 3 +- tools/testing/selftests/bpf/progs/kfunc_call_destructive.c | 3 +- tools/testing/selftests/bpf/progs/kfunc_call_fail.c | 9 +--- tools/testing/selftests/bpf/progs/kfunc_call_race.c | 3 +- tools/testing/selftests/bpf/progs/kfunc_call_test.c | 15 +----- tools/testing/selftests/bpf/progs/kfunc_call_test_subprog.c | 17 +++++-- tools/testing/selftests/bpf/progs/map_kptr.c | 1 + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 1 + tools/testing/selftests/bpf/test_progs.c | 67 +----------------------- tools/testing/selftests/bpf/test_verifier.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- tools/testing/selftests/bpf/testing_helpers.c | 63 +++++++++++++++++++++++ tools/testing/selftests/bpf/testing_helpers.h | 10 ++++ 16 files changed, 520 insertions(+), 371 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h