Skip to content

Commit

Permalink
libbpf: Deprecate bpf_object__unload() API since v0.7
Browse files Browse the repository at this point in the history
BPF objects are not re-loadable after unload. User are expected to use
bpf_object__close() to unload and free up resources in one operation.
No need to expose bpf_object__unload() as a public API, deprecate it.[0]
Add bpf_object_unload() as an alias to bpf_object__unload() and replace
all bpf_object__unload() to avoid compilation errors.

  [0] Closes: libbpf/libbpf#290

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Acked-by: Song Liu <songliubraving@fb.com>
  • Loading branch information
chenhengqi authored and Nobody committed Oct 6, 2021
1 parent ec51f5d commit 9a43db0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 5 additions & 2 deletions tools/lib/bpf/libbpf.c
Expand Up @@ -6691,6 +6691,9 @@ int bpf_object__unload(struct bpf_object *obj)
return 0;
}

__attribute__((alias("bpf_object__unload")))
static int bpf_object_unload(struct bpf_object *obj);

static int bpf_object__sanitize_maps(struct bpf_object *obj)
{
struct bpf_map *m;
Expand Down Expand Up @@ -7089,7 +7092,7 @@ int bpf_object__load_xattr(struct bpf_object_load_attr *attr)
if (obj->maps[i].pinned && !obj->maps[i].reused)
bpf_map__unpin(&obj->maps[i], NULL);

bpf_object__unload(obj);
bpf_object_unload(obj);
pr_warn("failed to load object '%s'\n", obj->path);
return libbpf_err(err);
}
Expand Down Expand Up @@ -7698,7 +7701,7 @@ void bpf_object__close(struct bpf_object *obj)

bpf_gen__free(obj->gen_loader);
bpf_object__elf_finish(obj);
bpf_object__unload(obj);
bpf_object_unload(obj);
btf__free(obj->btf);
btf_ext__free(obj->btf_ext);

Expand Down
1 change: 1 addition & 0 deletions tools/lib/bpf/libbpf.h
Expand Up @@ -150,6 +150,7 @@ struct bpf_object_load_attr {
/* Load/unload object into/from kernel */
LIBBPF_API int bpf_object__load(struct bpf_object *obj);
LIBBPF_API int bpf_object__load_xattr(struct bpf_object_load_attr *attr);
LIBBPF_DEPRECATED_SINCE(0, 7, "bpf_object__unload() is deprecated, use bpf_object__close() instead")
LIBBPF_API int bpf_object__unload(struct bpf_object *obj);

LIBBPF_API const char *bpf_object__name(const struct bpf_object *obj);
Expand Down

0 comments on commit 9a43db0

Please sign in to comment.