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

libbpf: Apply map_set_def_max_entries() for inner_maps on creation

This patch allows to auto create BPF_MAP_TYPE_ARRAY_OF_MAPS and
BPF_MAP_TYPE_HASH_OF_MAPS with values of BPF_MAP_TYPE_PERF_EVENT_ARRAY
by bpf_object__load().

Previous behaviour created a zero filled btf_map_def for inner maps and
tried to use it for a map creation but the linux kernel forbids to create
a BPF_MAP_TYPE_PERF_EVENT_ARRAY map with max_entries=0.

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-1-conquistador@yandex-team.ru
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Andrey Grafin and committed by
Alexei Starovoitov
f04deb90 091f2bf6

+4
+4
tools/lib/bpf/libbpf.c
··· 70 70 71 71 static struct bpf_map *bpf_object__add_map(struct bpf_object *obj); 72 72 static bool prog_is_subprog(const struct bpf_object *obj, const struct bpf_program *prog); 73 + static int map_set_def_max_entries(struct bpf_map *map); 73 74 74 75 static const char * const attach_type_name[] = { 75 76 [BPF_CGROUP_INET_INGRESS] = "cgroup_inet_ingress", ··· 5173 5172 5174 5173 if (bpf_map_type__is_map_in_map(def->type)) { 5175 5174 if (map->inner_map) { 5175 + err = map_set_def_max_entries(map->inner_map); 5176 + if (err) 5177 + return err; 5176 5178 err = bpf_object__create_map(obj, map->inner_map, true); 5177 5179 if (err) { 5178 5180 pr_warn("map '%s': failed to create inner map: %d\n",