selftests/bpf: Consolidate kernel modules into common directory
authorToke Høiland-Jørgensen <toke@redhat.com>
Wed, 4 Dec 2024 13:28:26 +0000 (14:28 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 6 Dec 2024 18:44:10 +0000 (10:44 -0800)
commitd6212d82bf26f3cbd30b84df064080dd98051ae9
treea3607d24a217ba206c6c1495822f1899b652caaf
parente10500b69c3f3378f3dcfc8c2fe4cdb74fc844f5
selftests/bpf: Consolidate kernel modules into common directory

The selftests build four kernel modules which use copy-pasted Makefile
targets. This is a bit messy, and doesn't scale so well when we add more
modules, so let's consolidate these rules into a single rule generated
for each module name, and move the module sources into a single
directory.

To avoid parallel builds of the different modules stepping on each
other's toes during the 'modpost' phase of the Kbuild 'make modules',
the module files should really be a grouped target. However, make only
added explicit support for grouped targets in version 4.3, which is
newer than the minimum version supported by the kernel. However, make
implicitly treats pattern matching rules with multiple targets as a
grouped target, so we can work around this by turning the rule into a
pattern matching target. We do this by replacing '.ko' with '%ko' in the
targets with subst().

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Viktor Malik <vmalik@redhat.com>
Link: https://lore.kernel.org/bpf/20241204-bpf-selftests-mod-compile-v5-1-b96231134a49@redhat.com
59 files changed:
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/bpf_test_modorder_x/Makefile [deleted file]
tools/testing/selftests/bpf/bpf_test_modorder_x/bpf_test_modorder_x.c [deleted file]
tools/testing/selftests/bpf/bpf_test_modorder_y/Makefile [deleted file]
tools/testing/selftests/bpf/bpf_test_modorder_y/bpf_test_modorder_y.c [deleted file]
tools/testing/selftests/bpf/bpf_test_no_cfi/Makefile [deleted file]
tools/testing/selftests/bpf/bpf_test_no_cfi/bpf_test_no_cfi.c [deleted file]
tools/testing/selftests/bpf/bpf_testmod/.gitignore [deleted file]
tools/testing/selftests/bpf/bpf_testmod/Makefile [deleted file]
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod-events.h [deleted file]
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c [deleted file]
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h [deleted file]
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h [deleted file]
tools/testing/selftests/bpf/prog_tests/core_reloc.c
tools/testing/selftests/bpf/progs/bad_struct_ops.c
tools/testing/selftests/bpf/progs/cb_refs.c
tools/testing/selftests/bpf/progs/epilogue_exit.c
tools/testing/selftests/bpf/progs/epilogue_tailcall.c
tools/testing/selftests/bpf/progs/iters_testmod.c
tools/testing/selftests/bpf/progs/jit_probe_mem.c
tools/testing/selftests/bpf/progs/kfunc_call_destructive.c
tools/testing/selftests/bpf/progs/kfunc_call_fail.c
tools/testing/selftests/bpf/progs/kfunc_call_race.c
tools/testing/selftests/bpf/progs/kfunc_call_test.c
tools/testing/selftests/bpf/progs/kfunc_call_test_subprog.c
tools/testing/selftests/bpf/progs/local_kptr_stash.c
tools/testing/selftests/bpf/progs/map_kptr.c
tools/testing/selftests/bpf/progs/map_kptr_fail.c
tools/testing/selftests/bpf/progs/missed_kprobe.c
tools/testing/selftests/bpf/progs/missed_kprobe_recursion.c
tools/testing/selftests/bpf/progs/nested_acquire.c
tools/testing/selftests/bpf/progs/pro_epilogue.c
tools/testing/selftests/bpf/progs/pro_epilogue_goto_start.c
tools/testing/selftests/bpf/progs/sock_addr_kern.c
tools/testing/selftests/bpf/progs/struct_ops_detach.c
tools/testing/selftests/bpf/progs/struct_ops_forgotten_cb.c
tools/testing/selftests/bpf/progs/struct_ops_maybe_null.c
tools/testing/selftests/bpf/progs/struct_ops_maybe_null_fail.c
tools/testing/selftests/bpf/progs/struct_ops_module.c
tools/testing/selftests/bpf/progs/struct_ops_multi_pages.c
tools/testing/selftests/bpf/progs/struct_ops_nulled_out_cb.c
tools/testing/selftests/bpf/progs/struct_ops_private_stack.c
tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c
tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c
tools/testing/selftests/bpf/progs/test_kfunc_param_nullable.c
tools/testing/selftests/bpf/progs/test_module_attach.c
tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c
tools/testing/selftests/bpf/progs/unsupported_ops.c
tools/testing/selftests/bpf/progs/wq.c
tools/testing/selftests/bpf/progs/wq_failures.c
tools/testing/selftests/bpf/test_kmods/.gitignore [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/Makefile [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_test_modorder_x.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_test_modorder_y.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_test_no_cfi.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_testmod-events.h [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_testmod.h [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h [new file with mode: 0644]