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

selftests: bpf: centre kernel bpf objects under new subdir "progs"

At the moment, all kernel bpf objects are listed under BPF_OBJ_FILES.
Listing them manually sometimes causing patch conflict when people are
adding new testcases simultaneously.

It is better to centre all the related source files under a subdir
"progs", then auto-generate the object file list.

Suggested-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Jiong Wang and committed by
Alexei Starovoitov bd4aed0e 4836b463

+5 -21
+5 -21
tools/testing/selftests/bpf/Makefile
··· 25 25 test_socket_cookie test_cgroup_storage test_select_reuseport test_section_names \ 26 26 test_netcnt test_tcpnotify_user test_sock_fields 27 27 28 - BPF_OBJ_FILES = \ 29 - test_xdp_redirect.o test_xdp_meta.o sockmap_parse_prog.o \ 30 - sockmap_verdict_prog.o dev_cgroup.o sample_ret0.o \ 31 - test_tcpnotify_kern.o sample_map_ret0.o test_tcpbpf_kern.o \ 32 - sockmap_tcp_msg_prog.o connect4_prog.o connect6_prog.o \ 33 - test_btf_haskv.o test_btf_nokv.o test_sockmap_kern.o \ 34 - test_tunnel_kern.o test_sockhash_kern.o test_lwt_seg6local.o \ 35 - sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ 36 - get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ 37 - test_skb_cgroup_id_kern.o bpf_flow.o netcnt_prog.o test_xdp_vlan.o \ 38 - xdp_dummy.o test_map_in_map.o test_spin_lock.o test_map_lock.o \ 39 - test_pkt_access.o test_xdp.o test_adjust_tail.o test_l4lb.o \ 40 - test_l4lb_noinline.o test_xdp_noinline.o test_tcp_estats.o \ 41 - test_obj_id.o test_pkt_md_access.o test_tracepoint.o \ 42 - test_stacktrace_map.o test_stacktrace_build_id.o \ 43 - test_get_stack_rawtp.o test_sk_lookup_kern.o test_queue_map.o \ 44 - test_stack_map.o test_sock_fields_kern.o 45 - 28 + BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) 46 29 TEST_GEN_FILES = $(BPF_OBJ_FILES) 47 30 48 31 # Also test sub-register code-gen if LLVM + kernel both has eBPF v3 processor ··· 167 184 $(CC) $(CFLAGS) -o $(ALU32_BUILD_DIR)/test_progs_32 $< \ 168 185 trace_helpers.c $(OUTPUT)/libbpf.a $(LDLIBS) 169 186 170 - $(ALU32_BUILD_DIR)/%.o: %.c $(ALU32_BUILD_DIR) $(ALU32_BUILD_DIR)/test_progs_32 187 + $(ALU32_BUILD_DIR)/%.o: progs/%.c $(ALU32_BUILD_DIR) \ 188 + $(ALU32_BUILD_DIR)/test_progs_32 171 189 $(CLANG) $(CLANG_FLAGS) \ 172 190 -O2 -target bpf -emit-llvm -c $< -o - | \ 173 191 $(LLC) -march=bpf -mattr=+alu32 -mcpu=$(CPU) $(LLC_FLAGS) \ ··· 180 196 181 197 # Have one program compiled without "-target bpf" to test whether libbpf loads 182 198 # it successfully 183 - $(OUTPUT)/test_xdp.o: test_xdp.c 199 + $(OUTPUT)/test_xdp.o: progs/test_xdp.c 184 200 $(CLANG) $(CLANG_FLAGS) \ 185 201 -O2 -emit-llvm -c $< -o - | \ 186 202 $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@ ··· 188 204 $(BTF_PAHOLE) -J $@ 189 205 endif 190 206 191 - $(OUTPUT)/%.o: %.c 207 + $(OUTPUT)/%.o: progs/%.c 192 208 $(CLANG) $(CLANG_FLAGS) \ 193 209 -O2 -target bpf -emit-llvm -c $< -o - | \ 194 210 $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@
tools/testing/selftests/bpf/bpf_flow.c tools/testing/selftests/bpf/progs/bpf_flow.c
tools/testing/selftests/bpf/connect4_prog.c tools/testing/selftests/bpf/progs/connect4_prog.c
tools/testing/selftests/bpf/connect6_prog.c tools/testing/selftests/bpf/progs/connect6_prog.c
tools/testing/selftests/bpf/dev_cgroup.c tools/testing/selftests/bpf/progs/dev_cgroup.c
tools/testing/selftests/bpf/get_cgroup_id_kern.c tools/testing/selftests/bpf/progs/get_cgroup_id_kern.c
tools/testing/selftests/bpf/netcnt_prog.c tools/testing/selftests/bpf/progs/netcnt_prog.c
tools/testing/selftests/bpf/sample_map_ret0.c tools/testing/selftests/bpf/progs/sample_map_ret0.c
tools/testing/selftests/bpf/sample_ret0.c tools/testing/selftests/bpf/progs/sample_ret0.c
tools/testing/selftests/bpf/sendmsg4_prog.c tools/testing/selftests/bpf/progs/sendmsg4_prog.c
tools/testing/selftests/bpf/sendmsg6_prog.c tools/testing/selftests/bpf/progs/sendmsg6_prog.c
tools/testing/selftests/bpf/sockmap_parse_prog.c tools/testing/selftests/bpf/progs/sockmap_parse_prog.c
tools/testing/selftests/bpf/sockmap_tcp_msg_prog.c tools/testing/selftests/bpf/progs/sockmap_tcp_msg_prog.c
tools/testing/selftests/bpf/sockmap_verdict_prog.c tools/testing/selftests/bpf/progs/sockmap_verdict_prog.c
tools/testing/selftests/bpf/test_adjust_tail.c tools/testing/selftests/bpf/progs/test_adjust_tail.c
tools/testing/selftests/bpf/test_btf_haskv.c tools/testing/selftests/bpf/progs/test_btf_haskv.c
tools/testing/selftests/bpf/test_btf_nokv.c tools/testing/selftests/bpf/progs/test_btf_nokv.c
tools/testing/selftests/bpf/test_get_stack_rawtp.c tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c
tools/testing/selftests/bpf/test_l4lb.c tools/testing/selftests/bpf/progs/test_l4lb.c
tools/testing/selftests/bpf/test_l4lb_noinline.c tools/testing/selftests/bpf/progs/test_l4lb_noinline.c
tools/testing/selftests/bpf/test_lirc_mode2_kern.c tools/testing/selftests/bpf/progs/test_lirc_mode2_kern.c
tools/testing/selftests/bpf/test_lwt_seg6local.c tools/testing/selftests/bpf/progs/test_lwt_seg6local.c
tools/testing/selftests/bpf/test_map_in_map.c tools/testing/selftests/bpf/progs/test_map_in_map.c
tools/testing/selftests/bpf/test_map_lock.c tools/testing/selftests/bpf/progs/test_map_lock.c
tools/testing/selftests/bpf/test_obj_id.c tools/testing/selftests/bpf/progs/test_obj_id.c
tools/testing/selftests/bpf/test_pkt_access.c tools/testing/selftests/bpf/progs/test_pkt_access.c
tools/testing/selftests/bpf/test_pkt_md_access.c tools/testing/selftests/bpf/progs/test_pkt_md_access.c
tools/testing/selftests/bpf/test_queue_map.c tools/testing/selftests/bpf/progs/test_queue_map.c
tools/testing/selftests/bpf/test_select_reuseport_kern.c tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c
tools/testing/selftests/bpf/test_sk_lookup_kern.c tools/testing/selftests/bpf/progs/test_sk_lookup_kern.c
tools/testing/selftests/bpf/test_skb_cgroup_id_kern.c tools/testing/selftests/bpf/progs/test_skb_cgroup_id_kern.c
tools/testing/selftests/bpf/test_sock_fields_kern.c tools/testing/selftests/bpf/progs/test_sock_fields_kern.c
tools/testing/selftests/bpf/test_sockhash_kern.c tools/testing/selftests/bpf/progs/test_sockhash_kern.c
tools/testing/selftests/bpf/test_sockmap_kern.c tools/testing/selftests/bpf/progs/test_sockmap_kern.c
tools/testing/selftests/bpf/test_spin_lock.c tools/testing/selftests/bpf/progs/test_spin_lock.c
tools/testing/selftests/bpf/test_stack_map.c tools/testing/selftests/bpf/progs/test_stack_map.c
tools/testing/selftests/bpf/test_stacktrace_build_id.c tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c
tools/testing/selftests/bpf/test_stacktrace_map.c tools/testing/selftests/bpf/progs/test_stacktrace_map.c
tools/testing/selftests/bpf/test_tcp_estats.c tools/testing/selftests/bpf/progs/test_tcp_estats.c
tools/testing/selftests/bpf/test_tcpbpf_kern.c tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c
tools/testing/selftests/bpf/test_tcpnotify_kern.c tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c
tools/testing/selftests/bpf/test_tracepoint.c tools/testing/selftests/bpf/progs/test_tracepoint.c
tools/testing/selftests/bpf/test_tunnel_kern.c tools/testing/selftests/bpf/progs/test_tunnel_kern.c
tools/testing/selftests/bpf/test_xdp.c tools/testing/selftests/bpf/progs/test_xdp.c
tools/testing/selftests/bpf/test_xdp_meta.c tools/testing/selftests/bpf/progs/test_xdp_meta.c
tools/testing/selftests/bpf/test_xdp_noinline.c tools/testing/selftests/bpf/progs/test_xdp_noinline.c
tools/testing/selftests/bpf/test_xdp_redirect.c tools/testing/selftests/bpf/progs/test_xdp_redirect.c
tools/testing/selftests/bpf/test_xdp_vlan.c tools/testing/selftests/bpf/progs/test_xdp_vlan.c
tools/testing/selftests/bpf/xdp_dummy.c tools/testing/selftests/bpf/progs/xdp_dummy.c