Commit 3c7e5859 authored by Quentin Monnet's avatar Quentin Monnet Committed by Andrii Nakryiko
Browse files

libbpf: Rename btf__load() as btf__load_into_kernel() 

As part of the effort to move towards a v1.0 for libbpf, rename
btf__load() function, used to "upload" BTF information into the kernel,
as btf__load_into_kernel(). This new name better reflects what the
function does.

References:

- https://github.com/libbpf/libbpf/issues/278
- https://github.com/libbpf/libbpf/wiki/Libbpf:-the-road-to-v1.0#btfh-apis



Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210729162028.29512-3-quentin@isovalent.com
parent 6d2d73cd

tools/lib/bpf/btf.c

+2 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ int btf__finalize_data(struct bpf_object *obj, struct btf *btf) 


static void *btf_get_raw_data(const struct btf *btf, __u32 *size, bool swap_endian);



int btf__load(struct btf *btf)

int btf__load_into_kernel(struct btf *btf)

{

	__u32 log_buf_size = 0, raw_size;

	char *log_buf = NULL;
@@ -1228,6 +1228,7 @@ int btf__load(struct btf *btf) 
	free(log_buf);

	return libbpf_err(err);

}

int btf__load(struct btf *) __attribute__((alias("btf__load_into_kernel")));



int btf__fd(const struct btf *btf)

{

tools/lib/bpf/btf.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ LIBBPF_API struct btf *btf__parse_raw_split(const char *path, struct btf *base_b 


LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf);

LIBBPF_API int btf__load(struct btf *btf);

LIBBPF_API int btf__load_into_kernel(struct btf *btf);

LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,

				   const char *type_name);

LIBBPF_API __s32 btf__find_by_name_kind(const struct btf *btf,

tools/lib/bpf/libbpf.c

+1 −1
Original line number Diff line number Diff line
@@ -2769,7 +2769,7 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj) 
		 */

		btf__set_fd(kern_btf, 0);

	} else {

		err = btf__load(kern_btf);

		err = btf__load_into_kernel(kern_btf);

	}

	if (sanitize) {

		if (!err) {

tools/lib/bpf/libbpf.map

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ LIBBPF_0.5.0 { 
		bpf_map_lookup_and_delete_elem_flags;

		bpf_program__attach_kprobe_opts;

		bpf_object__gen_loader;

		btf__load_into_kernel;

		btf_dump__dump_type_data;

		libbpf_set_strict_mode;

} LIBBPF_0.4.0;