mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-03 15:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Use libbpf_mem_ensure() when allocating new map

Browse Source 
Reuse libbpf_mem_ensure() when adding a new map to the list of maps
inside bpf_object. It takes care of proper resizing and reallocating of
map array and zeroing out newly allocated memory.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220428041523.4089853-3-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko
2022-04-27 21:15:21 -07:00
committed by Andrii Nakryiko
parent 1a18c6f051
commit d46f1aaa7c
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libbpf.c
View File

@@ -1433,36 +1433,19 @@ static int find_elf_var_offset(const struct bpf_object *obj, const char *name, _
static struct bpf_map *bpf_object__add_map(struct bpf_object *obj) static struct bpf_map *bpf_object__add_map(struct bpf_object *obj)
{ {
struct bpf_map *new_maps; struct bpf_map *map;
size_t new_cap; int err;
int i;
if (obj->nr_maps < obj->maps_cap) err = libbpf_ensure_mem((void **)&obj->maps, &obj->maps_cap,
return &obj->maps[obj->nr_maps++]; sizeof(*obj->maps), obj->nr_maps + 1);
if (err)
return ERR_PTR(err);
new_cap = max((size_t)4, obj->maps_cap * 3 / 2); map = &obj->maps[obj->nr_maps++];
new_maps = libbpf_reallocarray(obj->maps, new_cap, sizeof(*obj->maps)); map->fd = -1;
if (!new_maps) { map->inner_map_fd = -1;
pr_warn("alloc maps for object failed\n");
return ERR_PTR(-ENOMEM);
}
obj->maps_cap = new_cap; return map;
obj->maps = new_maps;
/* zero out new maps */
memset(obj->maps + obj->nr_maps, 0,
(obj->maps_cap - obj->nr_maps) * sizeof(*obj->maps));
/*
* fill all fd with -1 so won't close incorrect fd (fd=0 is stdin)
* when failure (zclose won't close negative fd)).
*/
for (i = obj->nr_maps; i < obj->maps_cap; i++) {
obj->maps[i].fd = -1;
obj->maps[i].inner_map_fd = -1;
}
return &obj->maps[obj->nr_maps++];
} }
static size_t bpf_map_mmap_sz(const struct bpf_map *map) static size_t bpf_map_mmap_sz(const struct bpf_map *map)