summaryrefslogtreecommitdiff
path: root/tools/lib
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2020-10-06 05:13:44 +0300
committerAlexei Starovoitov <ast@kernel.org>2020-10-06 21:10:20 +0300
commit2c193d32caee83322a8511a88ba0cd097bba73f1 (patch)
tree6243db9425658c32067a18f0c455947b7fbc7036 /tools/lib
parenta0f2b7acb4b1d29127ff99c714233b973afd1411 (diff)
downloadlinux-2c193d32caee83322a8511a88ba0cd097bba73f1.tar.xz
libbpf: Check if pin_path was set even map fd exist
Say a user reuse map fd after creating a map manually and set the pin_path, then load the object via libbpf. In libbpf bpf_object__create_maps(), bpf_object__reuse_map() will return 0 if there is no pinned map in map->pin_path. Then after checking if map fd exist, we should also check if pin_path was set and do bpf_map__pin() instead of continue the loop. Fix it by creating map if fd not exist and continue checking pin_path after that. Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20201006021345.3817033-3-liuhangbin@gmail.com
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/bpf/libbpf.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 7cec237d9d1f..9f90d1a686fd 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -4256,29 +4256,28 @@ bpf_object__create_maps(struct bpf_object *obj)
if (map->fd >= 0) {
pr_debug("map '%s': skipping creation (preset fd=%d)\n",
map->name, map->fd);
- continue;
- }
-
- err = bpf_object__create_map(obj, map);
- if (err)
- goto err_out;
+ } else {
+ err = bpf_object__create_map(obj, map);
+ if (err)
+ goto err_out;
- pr_debug("map '%s': created successfully, fd=%d\n", map->name,
- map->fd);
+ pr_debug("map '%s': created successfully, fd=%d\n",
+ map->name, map->fd);
- if (bpf_map__is_internal(map)) {
- err = bpf_object__populate_internal_map(obj, map);
- if (err < 0) {
- zclose(map->fd);
- goto err_out;
+ if (bpf_map__is_internal(map)) {
+ err = bpf_object__populate_internal_map(obj, map);
+ if (err < 0) {
+ zclose(map->fd);
+ goto err_out;
+ }
}
- }
- if (map->init_slots_sz) {
- err = init_map_slots(map);
- if (err < 0) {
- zclose(map->fd);
- goto err_out;
+ if (map->init_slots_sz) {
+ err = init_map_slots(map);
+ if (err < 0) {
+ zclose(map->fd);
+ goto err_out;
+ }
}
}