This patch set adds support for reading bitfields in a relocatable manner through a set of relocations emitted by Clang, corresponding libbpf support for those relocations, as well as abstracting details into BPF_CORE_READ_BITFIELD macro. We also add support for capturing relocatable field size, so that BPF program code can adjust its logic to actual amount of data it needs to operate on, even if it changes between kernels. New convenience macro is added to bpf_core_read.h (bpf_core_field_size(), in the same family of macro as bpf_core_read() and bpf_core_field_exists()). Corresponding set of selftests are added to excercise this logic and validate correctness in a variety of scenarios. Some of the overly strict logic of matching fields is relaxed to support wider variety of scenarios. See patch #1 for that. Patch #1 removes few overly strict test cases. Patch #2 adds support for bitfield-related relocations. Patch #3 adds some further adjustments to support generic field size relocations and introduces bpf_core_field_size() macro. Patch #4 tests bitfield reading. Patch #5 tests field size relocations. Andrii Nakryiko (5): selftests/bpf: remove too strict field offset relo test cases libbpf: add support for relocatable bitfields libbpf: add support for field size relocations selftest/bpf: add relocatable bitfield reading tests selftests/bpf: add field size relocation tests tools/lib/bpf/bpf_core_read.h | 47 ++++ tools/lib/bpf/libbpf.c | 243 +++++++++++++----- tools/lib/bpf/libbpf_internal.h | 4 + .../no_alu32/btf_dump_test_case_bitfields.c | 92 +++++++ .../no_alu32/btf_dump_test_case_multidim.c | 35 +++ .../no_alu32/btf_dump_test_case_namespacing.c | 73 ++++++ .../no_alu32/btf_dump_test_case_ordering.c | 63 +++++ .../bpf/no_alu32/btf_dump_test_case_packing.c | 75 ++++++ .../bpf/no_alu32/btf_dump_test_case_padding.c | 114 ++++++++ .../bpf/no_alu32/btf_dump_test_case_syntax.c | 229 +++++++++++++++++ .../selftests/bpf/prog_tests/core_reloc.c | 92 ++++++- ...__core_reloc_arrays___err_wrong_val_type.c | 3 + ..._core_reloc_arrays___err_wrong_val_type1.c | 3 - ..._core_reloc_arrays___err_wrong_val_type2.c | 3 - .../bpf/progs/btf__core_reloc_bitfields.c | 3 + ...tf__core_reloc_bitfields___bit_sz_change.c | 3 + ...__core_reloc_bitfields___bitfield_vs_int.c | 3 + ...e_reloc_bitfields___err_too_big_bitfield.c | 3 + ...__core_reloc_bitfields___just_big_enough.c | 3 + .../btf__core_reloc_ints___err_bitfield.c | 3 - .../btf__core_reloc_ints___err_wrong_sz_16.c | 3 - .../btf__core_reloc_ints___err_wrong_sz_32.c | 3 - .../btf__core_reloc_ints___err_wrong_sz_64.c | 3 - .../btf__core_reloc_ints___err_wrong_sz_8.c | 3 - .../bpf/progs/btf__core_reloc_size.c | 3 + .../progs/btf__core_reloc_size___diff_sz.c | 3 + .../selftests/bpf/progs/core_reloc_types.h | 173 ++++++++----- .../bpf/progs/test_core_reloc_bitfields.c | 69 +++++ .../bpf/progs/test_core_reloc_size.c | 51 ++++ 29 files changed, 1246 insertions(+), 159 deletions(-) create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_bitfields.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_multidim.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_namespacing.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_ordering.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_packing.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_padding.c create mode 100644 tools/testing/selftests/bpf/no_alu32/btf_dump_test_case_syntax.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bit_sz_change.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bitfield_vs_int.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___err_too_big_bitfield.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___just_big_enough.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size.c create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_sz.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_bitfields.c create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_size.c -- 2.17.1
