Add clang-based BTF_KIND_FLOAT tests
Subsystems (3)
v2 cover Add clang-based BTF_KIND_FLOAT tests
The two tests here did not make it into the main BTF_KIND_FLOAT series because of dependency on LLVM.
v0: https://lore.kernel.org/bpf/[email protected]/
v1 -> v0: Per Alexei's suggestion, document the required LLVM commit.
v1: https://lore.kernel.org/bpf/[email protected]/
v1 -> v2: Per Andrii's suggestions, use double in
core_reloc_size___diff_sz and non-pointer member in btf_dump_test_case_syntax.
Ilya Leoshkevich (2):
selftests/bpf: Add BTF_KIND_FLOAT to test_core_reloc_size selftests/bpf: Add BTF_KIND_FLOAT to btf_dump_test_case_syntax
tools/testing/selftests/bpf/README.rst | 9 +++++++++ tools/testing/selftests/bpf/prog_tests/core_reloc.c | 1 + .../selftests/bpf/progs/btf_dump_test_case_syntax.c | 7 +++++++ tools/testing/selftests/bpf/progs/core_reloc_types.h | 5 +++++ tools/testing/selftests/bpf/progs/test_core_reloc_size.c | 3 +++ 5 files changed, 25 insertions(+)
Signature · 1 line
2.29.2
PATCH v2 1/2 selftests/bpf: Add BTF_KIND_FLOAT to test_core_reloc_size
Verify that bpf_core_field_size() is working correctly with floats. Also document the required clang version.
--- tools/testing/selftests/bpf/README.rst | 9 +++++++++ tools/testing/selftests/bpf/prog_tests/core_reloc.c | 1 + tools/testing/selftests/bpf/progs/core_reloc_types.h | 5 +++++ tools/testing/selftests/bpf/progs/test_core_reloc_size.c | 3 +++ 4 files changed, 18 insertions(+)
tools/testing/selftests/bpf/README.rst +9 -0
@@ -170,3 +170,12 @@ failures: .. _2: https://reviews.llvm.org/D85174 .. _3: https://reviews.llvm.org/D83878 .. _4: https://reviews.llvm.org/D83242 + +Floating-point tests and Clang version +====================================== + +Certain selftests, e.g. core_reloc, require support for the floating-point +types, which was introduced in `Clang 13`__. The older Clang versions will +either crash when compiling these tests, or generate an incorrect BTF. + +__ https://reviews.llvm.org/D83289
tools/testing/selftests/bpf/prog_tests/core_reloc.c +1 -0
@@ -266,6 +266,7 @@ static int duration = 0; .arr_elem_sz = sizeof(((type *)0)->arr_field[0]), \ .ptr_sz = 8, /* always 8-byte pointer for BPF */ \ .enum_sz = sizeof(((type *)0)->enum_field), \ + .float_sz = sizeof(((type *)0)->float_field), \ }#define SIZE_CASE (name) { \
tools/testing/selftests/bpf/progs/core_reloc_types.h +5 -0
@@ -807,6 +807,7 @@ struct core_reloc_size_output {int arr_elem_sz;int ptr_sz;int enum_sz; +int float_sz; };struct core_reloc_size {
@@ -816,6 +817,7 @@ struct core_reloc_size {int arr_field[4 ];void *ptr_field;enum {VALUE =123 } enum_field; +float float_field; };struct core_reloc_size___diff_sz {
@@ -825,6 +827,7 @@ struct core_reloc_size___diff_sz {char arr_field[10 ];void *ptr_field;enum {OTHER_VALUE =0xFFFFFFFFFFFFFFFF } enum_field; +double float_field; };/* Error case of two candidates with the fields (int_field) at the same
@@ -839,6 +842,7 @@ struct core_reloc_size___err_ambiguous1 {int arr_field[4 ];void *ptr_field;enum {VALUE___1 =123 } enum_field; +float float_field; };struct core_reloc_size___err_ambiguous2 {
@@ -850,6 +854,7 @@ struct core_reloc_size___err_ambiguous2 {int arr_field[4 ];void *ptr_field;enum {VALUE___2 =123 } enum_field; +float float_field; };/*
tools/testing/selftests/bpf/progs/test_core_reloc_size.c +3 -0
@@ -21,6 +21,7 @@ struct core_reloc_size_output {int arr_elem_sz;int ptr_sz;int enum_sz; +int float_sz; };struct core_reloc_size {
@@ -30,6 +31,7 @@ struct core_reloc_size {int arr_field[4 ];void *ptr_field;enum {VALUE =123 } enum_field; +float float_field; };SEC ("raw_tracepoint/sys_enter" )
@@ -45,6 +47,7 @@ int test_core_size(void *ctx) out->arr_elem_sz =bpf_core_field_size (in->arr_field[0 ]); out->ptr_sz =bpf_core_field_size (in->ptr_field); out->enum_sz =bpf_core_field_size (in->enum_field); + out->float_sz =bpf_core_field_size (in->float_field);return 0 ; }
Signature · 1 line
2.29.2
PATCH v2 2/2 selftests/bpf: Add BTF_KIND_FLOAT to btf_dump_test_case_syntax
In reply to Ilya LeoshkevichCheck that dumping various floating-point types produces a valid C code.
--- .../selftests/bpf/progs/btf_dump_test_case_syntax.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c +7 -0
@@ -205,6 +205,12 @@ struct struct_with_embedded_stuff {int t[11 ]; }; +struct float_struct { +float f; +const double *d; +volatile long double *ld; +}; +struct root_struct {enum e1 _1;enum e2 _2;
@@ -219,6 +225,7 @@ struct root_struct {union_fwd_t *_12;union_fwd_ptr_t _13;struct struct_with_embedded_stuff _14; +struct float_struct _15; };/* ------ END-EXPECTED-OUTPUT ------ */
Signature · 1 line
2.29.2