Hi! The tools/testing/selftests/bpf/test_verifier.c file is way too large, and since most people add their at the end of the list it's very prone to conflicts.
Break it up in the simplest possible way - slice the array up into smaller C files and include them in the right spot. Tested: $ make -C tools/testing/selftests/bpf/ $ cd tools/testing/selftests/bpf/ ; make Jakub Kicinski (3): selftests: bpf: prepare for break up of verifier tests selftests: bpf: break up test_verifier selftests: bpf: break up the rest of test_verifier tools/testing/selftests/bpf/Makefile | 13 + tools/testing/selftests/bpf/test_verifier.c | 15390 +--------------- .../testing/selftests/bpf/verifier/.gitignore | 1 + tools/testing/selftests/bpf/verifier/and.c | 53 + .../selftests/bpf/verifier/array_access.c | 238 + tools/testing/selftests/bpf/verifier/basic.c | 23 + .../selftests/bpf/verifier/basic_call.c | 54 + .../selftests/bpf/verifier/basic_instr.c | 134 + .../selftests/bpf/verifier/basic_stack.c | 65 + .../selftests/bpf/verifier/basic_stx_ldx.c | 45 + tools/testing/selftests/bpf/verifier/bounds.c | 528 + .../selftests/bpf/verifier/bounds_deduction.c | 124 + .../bpf/verifier/bounds_mix_sign_unsign.c | 422 + .../selftests/bpf/verifier/bpf_get_stack.c | 45 + tools/testing/selftests/bpf/verifier/calls.c | 1960 ++ tools/testing/selftests/bpf/verifier/cfg.c | 70 + .../bpf/verifier/cgroup_inv_retcode.c | 72 + .../selftests/bpf/verifier/cgroup_skb.c | 198 + .../selftests/bpf/verifier/cgroup_storage.c | 234 + .../testing/selftests/bpf/verifier/const_or.c | 60 + tools/testing/selftests/bpf/verifier/ctx.c | 93 + .../selftests/bpf/verifier/ctx_sk_msg.c | 180 + .../testing/selftests/bpf/verifier/ctx_skb.c | 1000 + .../bpf/verifier/direct_packet_access.c | 633 + .../verifier/direct_stack_access_wraparound.c | 40 + tools/testing/selftests/bpf/verifier/div0.c | 184 + .../selftests/bpf/verifier/div_overflow.c | 104 + .../bpf/verifier/helper_access_val_len.c | 621 + .../bpf/verifier/helper_packet_access.c | 486 + .../bpf/verifier/helper_value_access.c | 978 + tools/testing/selftests/bpf/verifier/jit.c | 88 + tools/testing/selftests/bpf/verifier/jset.c | 191 + tools/testing/selftests/bpf/verifier/jump.c | 181 + .../selftests/bpf/verifier/junk_insn.c | 45 + tools/testing/selftests/bpf/verifier/ld_abs.c | 287 + tools/testing/selftests/bpf/verifier/ld_dw.c | 36 + .../testing/selftests/bpf/verifier/ld_imm64.c | 141 + tools/testing/selftests/bpf/verifier/ld_ind.c | 72 + .../testing/selftests/bpf/verifier/leak_ptr.c | 68 + tools/testing/selftests/bpf/verifier/lwt.c | 189 + .../selftests/bpf/verifier/map_in_map.c | 68 + .../selftests/bpf/verifier/map_ptr_mixing.c | 106 + .../selftests/bpf/verifier/map_ret_val.c | 69 + .../testing/selftests/bpf/verifier/masking.c | 322 + .../selftests/bpf/verifier/meta_access.c | 247 + .../bpf/verifier/perf_event_sample_period.c | 59 + .../bpf/verifier/prevent_map_lookup.c | 79 + .../selftests/bpf/verifier/raw_stack.c | 321 + .../selftests/bpf/verifier/ref_tracking.c | 611 + .../selftests/bpf/verifier/runtime_jit.c | 86 + .../selftests/bpf/verifier/search_pruning.c | 160 + .../selftests/bpf/verifier/spill_fill.c | 75 + .../selftests/bpf/verifier/stack_ptr.c | 317 + tools/testing/selftests/bpf/verifier/uninit.c | 39 + tools/testing/selftests/bpf/verifier/unpriv.c | 531 + tools/testing/selftests/bpf/verifier/value.c | 105 + .../selftests/bpf/verifier/value_adj_spill.c | 43 + .../bpf/verifier/value_illegal_alu.c | 94 + .../selftests/bpf/verifier/value_or_null.c | 160 + .../selftests/bpf/verifier/value_ptr_arith.c | 823 + .../testing/selftests/bpf/verifier/var_off.c | 67 + tools/testing/selftests/bpf/verifier/xadd.c | 99 + tools/testing/selftests/bpf/verifier/xdp.c | 14 + .../bpf/verifier/xdp_direct_packet_access.c | 950 + 64 files changed, 15404 insertions(+), 15387 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/.gitignore create mode 100644 tools/testing/selftests/bpf/verifier/and.c create mode 100644 tools/testing/selftests/bpf/verifier/array_access.c create mode 100644 tools/testing/selftests/bpf/verifier/basic.c create mode 100644 tools/testing/selftests/bpf/verifier/basic_call.c create mode 100644 tools/testing/selftests/bpf/verifier/basic_instr.c create mode 100644 tools/testing/selftests/bpf/verifier/basic_stack.c create mode 100644 tools/testing/selftests/bpf/verifier/basic_stx_ldx.c create mode 100644 tools/testing/selftests/bpf/verifier/bounds.c create mode 100644 tools/testing/selftests/bpf/verifier/bounds_deduction.c create mode 100644 tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c create mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c create mode 100644 tools/testing/selftests/bpf/verifier/calls.c create mode 100644 tools/testing/selftests/bpf/verifier/cfg.c create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_skb.c create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_storage.c create mode 100644 tools/testing/selftests/bpf/verifier/const_or.c create mode 100644 tools/testing/selftests/bpf/verifier/ctx.c create mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_msg.c create mode 100644 tools/testing/selftests/bpf/verifier/ctx_skb.c create mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c create mode 100644 tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c create mode 100644 tools/testing/selftests/bpf/verifier/div0.c create mode 100644 tools/testing/selftests/bpf/verifier/div_overflow.c create mode 100644 tools/testing/selftests/bpf/verifier/helper_access_val_len.c create mode 100644 tools/testing/selftests/bpf/verifier/helper_packet_access.c create mode 100644 tools/testing/selftests/bpf/verifier/helper_value_access.c create mode 100644 tools/testing/selftests/bpf/verifier/jit.c create mode 100644 tools/testing/selftests/bpf/verifier/jset.c create mode 100644 tools/testing/selftests/bpf/verifier/jump.c create mode 100644 tools/testing/selftests/bpf/verifier/junk_insn.c create mode 100644 tools/testing/selftests/bpf/verifier/ld_abs.c create mode 100644 tools/testing/selftests/bpf/verifier/ld_dw.c create mode 100644 tools/testing/selftests/bpf/verifier/ld_imm64.c create mode 100644 tools/testing/selftests/bpf/verifier/ld_ind.c create mode 100644 tools/testing/selftests/bpf/verifier/leak_ptr.c create mode 100644 tools/testing/selftests/bpf/verifier/lwt.c create mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c create mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c create mode 100644 tools/testing/selftests/bpf/verifier/map_ret_val.c create mode 100644 tools/testing/selftests/bpf/verifier/masking.c create mode 100644 tools/testing/selftests/bpf/verifier/meta_access.c create mode 100644 tools/testing/selftests/bpf/verifier/perf_event_sample_period.c create mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c create mode 100644 tools/testing/selftests/bpf/verifier/raw_stack.c create mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c create mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c create mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c create mode 100644 tools/testing/selftests/bpf/verifier/spill_fill.c create mode 100644 tools/testing/selftests/bpf/verifier/stack_ptr.c create mode 100644 tools/testing/selftests/bpf/verifier/uninit.c create mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c create mode 100644 tools/testing/selftests/bpf/verifier/value.c create mode 100644 tools/testing/selftests/bpf/verifier/value_adj_spill.c create mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c create mode 100644 tools/testing/selftests/bpf/verifier/value_or_null.c create mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c create mode 100644 tools/testing/selftests/bpf/verifier/var_off.c create mode 100644 tools/testing/selftests/bpf/verifier/xadd.c create mode 100644 tools/testing/selftests/bpf/verifier/xdp.c create mode 100644 tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c -- 2.19.2
