Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftest/bpf: Add map_in_maps with BPF_MAP_TYPE_PERF_EVENT_ARRAY values

Check that bpf_object__load() successfully creates map_in_maps
with BPF_MAP_TYPE_PERF_EVENT_ARRAY values.
These changes cover fix in the previous patch
"libbpf: Apply map_set_def_max_entries() for inner_maps on creation".

A command line output is:
- w/o fix
$ sudo ./test_maps
libbpf: map 'mim_array_pe': failed to create inner map: -22
libbpf: map 'mim_array_pe': failed to create: Invalid argument(-22)
libbpf: failed to load object './test_map_in_map.bpf.o'
Failed to load test prog

- with fix
$ sudo ./test_maps
...
test_maps: OK, 0 SKIPPED

Fixes: 646f02ffdd49 ("libbpf: Add BTF-defined map-in-map support")
Signed-off-by: Andrey Grafin <conquistador@yandex-team.ru>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/bpf/20240117130619.9403-2-conquistador@yandex-team.ru
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Andrey Grafin and committed by
Alexei Starovoitov
40628f9f f04deb90

+31 -1
+26
tools/testing/selftests/bpf/progs/test_map_in_map.c
··· 21 21 __type(value, __u32); 22 22 } mim_hash SEC(".maps"); 23 23 24 + /* The following three maps are used to test 25 + * perf_event_array map can be an inner 26 + * map of hash/array_of_maps. 27 + */ 28 + struct perf_event_array { 29 + __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); 30 + __type(key, __u32); 31 + __type(value, __u32); 32 + } inner_map0 SEC(".maps"); 33 + 34 + struct { 35 + __uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS); 36 + __uint(max_entries, 1); 37 + __type(key, __u32); 38 + __array(values, struct perf_event_array); 39 + } mim_array_pe SEC(".maps") = { 40 + .values = {&inner_map0}}; 41 + 42 + struct { 43 + __uint(type, BPF_MAP_TYPE_HASH_OF_MAPS); 44 + __uint(max_entries, 1); 45 + __type(key, __u32); 46 + __array(values, struct perf_event_array); 47 + } mim_hash_pe SEC(".maps") = { 48 + .values = {&inner_map0}}; 49 + 24 50 SEC("xdp") 25 51 int xdp_mimtest0(struct xdp_md *ctx) 26 52 {
+5 -1
tools/testing/selftests/bpf/test_maps.c
··· 1190 1190 goto out_map_in_map; 1191 1191 } 1192 1192 1193 - bpf_object__load(obj); 1193 + err = bpf_object__load(obj); 1194 + if (err) { 1195 + printf("Failed to load test prog\n"); 1196 + goto out_map_in_map; 1197 + } 1194 1198 1195 1199 map = bpf_object__find_map_by_name(obj, "mim_array"); 1196 1200 if (!map) {