This patch set teaches libbpf how to declare and initialize ARRAY_OF_MAPS and HASH_OF_MAPS maps. See patch #3 for all the details. Patch #1 refactors parsing BTF definition of map to re-use it cleanly for inner map definition parsing. Patch #2 refactors map creation and destruction logic for reuse. It also fixes existing bug with not closing successfully created maps when bpf_object map creation overall fails. Patch #3 adds support for an extension of BTF-defined map syntax, as well as parsing, recording, and use of relocations to allow declaratively initialize outer maps with references to inner maps. v1->v2: - rename __inner to __array (Alexei). Andrii Nakryiko (3): libbpf: refactor BTF-defined map definition parsing logic libbpf: refactor map creation logic and fix cleanup leak libbpf: add BTF-defined map-in-map support tools/lib/bpf/bpf_helpers.h | 1 + tools/lib/bpf/libbpf.c | 698 ++++++++++++------ .../selftests/bpf/prog_tests/btf_map_in_map.c | 49 ++ .../selftests/bpf/progs/test_btf_map_in_map.c | 76 ++ 4 files changed, 606 insertions(+), 218 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c create mode 100644 tools/testing/selftests/bpf/progs/test_btf_map_in_map.c -- 2.24.1
