elf: test BTF map typedef support

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
cilium · Oct 10, 2023 · ccd0b88 · ccd0b88
1 parent 5075058
commit ccd0b88
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 0 deletions.
diff --git a/elf_reader_test.go b/elf_reader_test.go
@@ -88,6 +88,13 @@ func TestLoadCollectionSpec(t *testing.T) {
 					MaxEntries: 1,
 				},
 			},
+			"btf_typedef_map": {
+				Name:       "btf_typedef_map",
+				Type:       Array,
+				KeySize:    4,
+				ValueSize:  8,
+				MaxEntries: 1,
+			},
 		},
 		Programs: map[string]*ProgramSpec{
 			"xdp_prog": {

diff --git a/testdata/loader-clang-11-eb.elf b/testdata/loader-clang-11-eb.elf
diff --git a/testdata/loader-clang-11-el.elf b/testdata/loader-clang-11-el.elf
diff --git a/testdata/loader-clang-14-eb.elf b/testdata/loader-clang-14-eb.elf
diff --git a/testdata/loader-clang-14-el.elf b/testdata/loader-clang-14-el.elf
diff --git a/testdata/loader-clang-17-eb.elf b/testdata/loader-clang-17-eb.elf
diff --git a/testdata/loader-clang-17-el.elf b/testdata/loader-clang-17-el.elf
diff --git a/testdata/loader.c b/testdata/loader.c
@@ -69,6 +69,16 @@ struct bpf_map_def array_of_hash_map __section("maps") = {
 	.max_entries = 2,
 };
 
+typedef struct {
+	__uint(type, BPF_MAP_TYPE_ARRAY);
+	__uint(key_size, sizeof(uint32_t));
+	__uint(value_size, sizeof(uint64_t));
+	__uint(max_entries, 1);
+} array_map_t;
+
+// Map definition behind a typedef.
+array_map_t btf_typedef_map __section(".maps");
+
 static int __attribute__((noinline)) __section("static") static_fn(uint32_t arg) {
 	return arg - 1;
 }