On Mon, Aug 15, 2022 at 9:23 PM Andrii Nakryiko <andrii@xxxxxxxxxx> wrote:
>
> Remove two missed deprecated APIs that were aliased to new APIs:
> bpf_object__unload and bpf_prog_attach_xattr.
>
Three functions? Missing btf__load()?
> Also move legacy API libbpf_find_kernel_btf (aliased to
> btf__load_vmlinux_btf) into libbpf_legacy.h.
>
> Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> ---
The change itself looks good to me. Verified these functions are no
longer used in the source file.
Acked-by: Hao Luo <haoluo@xxxxxxxxxx>
> tools/lib/bpf/bpf.c | 5 -----
> tools/lib/bpf/btf.c | 2 --
> tools/lib/bpf/btf.h | 1 -
> tools/lib/bpf/libbpf.c | 2 --
> tools/lib/bpf/libbpf_legacy.h | 2 ++
> 5 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index e3a0bd7efa2f..1d49a0352836 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -641,11 +641,6 @@ int bpf_prog_attach_opts(int prog_fd, int target_fd,
> return libbpf_err_errno(ret);
> }
>
> -__attribute__((alias("bpf_prog_attach_opts")))
> -int bpf_prog_attach_xattr(int prog_fd, int target_fd,
> - enum bpf_attach_type type,
> - const struct bpf_prog_attach_opts *opts);
> -
> int bpf_prog_detach(int target_fd, enum bpf_attach_type type)
> {
> const size_t attr_sz = offsetofend(union bpf_attr, replace_bpf_fd);
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index 2d14f1a52d7a..361131518d63 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -1225,8 +1225,6 @@ int btf__load_into_kernel(struct btf *btf)
> return btf_load_into_kernel(btf, NULL, 0, 0);
> }
>
> -int btf__load(struct btf *) __attribute__((alias("btf__load_into_kernel")));
> -
> int btf__fd(const struct btf *btf)
> {
> return btf->fd;
> diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
> index 583760df83b4..ae543144ee30 100644
> --- a/tools/lib/bpf/btf.h
> +++ b/tools/lib/bpf/btf.h
> @@ -116,7 +116,6 @@ LIBBPF_API struct btf *btf__parse_raw_split(const char *path, struct btf *base_b
>
> LIBBPF_API struct btf *btf__load_vmlinux_btf(void);
> LIBBPF_API struct btf *btf__load_module_btf(const char *module_name, struct btf *vmlinux_btf);
> -LIBBPF_API struct btf *libbpf_find_kernel_btf(void);
>
> LIBBPF_API struct btf *btf__load_from_kernel_by_id(__u32 id);
> LIBBPF_API struct btf *btf__load_from_kernel_by_id_split(__u32 id, struct btf *base_btf);
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 89f192a3ef77..9aaf6f7e89df 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -7260,8 +7260,6 @@ static int bpf_object_unload(struct bpf_object *obj)
> return 0;
> }
>
> -int bpf_object__unload(struct bpf_object *obj) __attribute__((alias("bpf_object_unload")));
> -
> static int bpf_object__sanitize_maps(struct bpf_object *obj)
> {
> struct bpf_map *m;
> diff --git a/tools/lib/bpf/libbpf_legacy.h b/tools/lib/bpf/libbpf_legacy.h
> index 5b7e0155db6a..1e1be467bede 100644
> --- a/tools/lib/bpf/libbpf_legacy.h
> +++ b/tools/lib/bpf/libbpf_legacy.h
> @@ -125,6 +125,8 @@ struct bpf_map;
> struct btf;
> struct btf_ext;
>
> +LIBBPF_API struct btf *libbpf_find_kernel_btf(void);
> +
> LIBBPF_API enum bpf_prog_type bpf_program__get_type(const struct bpf_program *prog);
> LIBBPF_API enum bpf_attach_type bpf_program__get_expected_attach_type(const struct bpf_program *prog);
> LIBBPF_API const char *bpf_map__get_pin_path(const struct bpf_map *map);
> --
> 2.30.2
>
