Merge branch 'Support static initialization of BPF_MAP_TYPE_PROG_ARRAY'

Browse source

Hengqi Chen says:

====================

Make libbpf support static initialization of BPF_MAP_TYPE_PROG_ARRAY
with a syntax similar to map-in-map initialization:

    SEC("socket")
    int tailcall_1(void *ctx)
    {
        return 0;
    }

    struct {
        __uint(type, BPF_MAP_TYPE_PROG_ARRAY);
        __uint(max_entries, 2);
        __uint(key_size, sizeof(__u32));
        __array(values, int (void *));
    } prog_array_init SEC(".maps") = {
        .values = {
            [1] = (void *)&tailcall_1,
        },
    };

v1->v2:
  - Add stricter checks on relos collect, some renamings (Andrii)
  - Update selftest to check tailcall result (Andrii)
====================

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

...

This commit is contained in:

Andrii Nakryiko 2021-11-28 22:09:08 -08:00

parent e32cb12ff5 baeead213e

commit da61e9e3ae

3 changed files with 192 additions and 33 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

154

tools/lib/bpf/libbpf.c

View file

32

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

View file

39

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

View file