Merge branch 'BTF-map-in-map'

Browse source

Andrii Nakryiko says:

====================
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).
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2020-04-28 17:35:03 -07:00

parent 1f427a8077 646f02ffdd

commit 3271e8f3f6

4 changed files with 606 additions and 218 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

tools/lib/bpf/bpf_helpers.h

View file

824

tools/lib/bpf/libbpf.c

View file

49

tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c

View file

76

tools/testing/selftests/bpf/progs/test_btf_map_in_map.c

View file