Commit d29d87f7 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

btf: separate btf creation and loading 



This change splits out previous btf__new functionality of constructing
struct btf and loading it into kernel into two:
- btf__new() just creates and initializes struct btf
- btf__load() attempts to load existing struct btf into kernel

btf__free will still close BTF fd, if it was ever loaded successfully
into kernel.

This change allows users of libbpf to manipulate BTF using its API,
without the need to unnecessarily load it into kernel.

One of the intended use cases is pahole, which will do DWARF to BTF
conversion and then use libbpf to do type deduplication, while then
handling ELF sections overwriting and other concerns on its own.

Fixes: 2d3feca8 ("bpf: btf: print map dump and lookup with btf info")
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent a4021a35

tools/lib/bpf/btf.c

+30 −24
Original line number Original line Diff line number Diff line
@@ -367,8 +367,6 @@ void btf__free(struct btf *btf) 




struct btf *btf__new(__u8 *data, __u32 size)

struct btf *btf__new(__u8 *data, __u32 size)

{

{

	__u32 log_buf_size = 0;

	char *log_buf = NULL;

	struct btf *btf;

	struct btf *btf;

	int err;

	int err;
@@ -378,15 +376,6 @@ struct btf *btf__new(__u8 *data, __u32 size) 




	btf->fd = -1;

	btf->fd = -1;





	log_buf = malloc(BPF_LOG_BUF_SIZE);

	if (!log_buf) {

		err = -ENOMEM;

		goto done;

	}



	*log_buf = 0;

	log_buf_size = BPF_LOG_BUF_SIZE;



	btf->data = malloc(size);

	btf->data = malloc(size);

	if (!btf->data) {

	if (!btf->data) {

		err = -ENOMEM;

		err = -ENOMEM;
@@ -396,17 +385,6 @@ struct btf *btf__new(__u8 *data, __u32 size) 
	memcpy(btf->data, data, size);

	memcpy(btf->data, data, size);

	btf->data_size = size;

	btf->data_size = size;





	btf->fd = bpf_load_btf(btf->data, btf->data_size,

			       log_buf, log_buf_size, false);



	if (btf->fd == -1) {

		err = -errno;

		pr_warning("Error loading BTF: %s(%d)\n", strerror(errno), errno);

		if (log_buf && *log_buf)

			pr_warning("%s\n", log_buf);

		goto done;

	}



	err = btf_parse_hdr(btf);

	err = btf_parse_hdr(btf);

	if (err)

	if (err)

		goto done;

		goto done;
@@ -418,8 +396,6 @@ struct btf *btf__new(__u8 *data, __u32 size) 
	err = btf_parse_type_sec(btf);

	err = btf_parse_type_sec(btf);





done:

done:

	free(log_buf);



	if (err) {

	if (err) {

		btf__free(btf);

		btf__free(btf);

		return ERR_PTR(err);

		return ERR_PTR(err);
@@ -428,6 +404,36 @@ done: 
	return btf;

	return btf;

}

}





int btf__load(struct btf *btf)

{

	__u32 log_buf_size = BPF_LOG_BUF_SIZE;

	char *log_buf = NULL;

	int err = 0;



	if (btf->fd >= 0)

		return -EEXIST;



	log_buf = malloc(log_buf_size);

	if (!log_buf)

		return -ENOMEM;



	*log_buf = 0;



	btf->fd = bpf_load_btf(btf->data, btf->data_size,

			       log_buf, log_buf_size, false);

	if (btf->fd < 0) {

		err = -errno;

		pr_warning("Error loading BTF: %s(%d)\n", strerror(errno), errno);

		if (*log_buf)

			pr_warning("%s\n", log_buf);

		goto done;

	}



done:

	free(log_buf);

	return err;

}



int btf__fd(const struct btf *btf)

int btf__fd(const struct btf *btf)

{

{

	return btf->fd;

	return btf->fd;

tools/lib/bpf/btf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ struct btf_ext_header { 




LIBBPF_API void btf__free(struct btf *btf);

LIBBPF_API void btf__free(struct btf *btf);

LIBBPF_API struct btf *btf__new(__u8 *data, __u32 size);

LIBBPF_API struct btf *btf__new(__u8 *data, __u32 size);

LIBBPF_API int btf__load(struct btf *btf);

LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,

LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,

				   const char *type_name);

				   const char *type_name);

LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf);

LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf);

tools/lib/bpf/libbpf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -836,7 +836,7 @@ static int bpf_object__elf_collect(struct bpf_object *obj, int flags) 
			obj->efile.maps_shndx = idx;

			obj->efile.maps_shndx = idx;

		else if (strcmp(name, BTF_ELF_SEC) == 0) {

		else if (strcmp(name, BTF_ELF_SEC) == 0) {

			obj->btf = btf__new(data->d_buf, data->d_size);

			obj->btf = btf__new(data->d_buf, data->d_size);

			if (IS_ERR(obj->btf)) {

			if (IS_ERR(obj->btf) || btf__load(obj->btf)) {

				pr_warning("Error loading ELF section %s: %ld. Ignored and continue.\n",

				pr_warning("Error loading ELF section %s: %ld. Ignored and continue.\n",

					   BTF_ELF_SEC, PTR_ERR(obj->btf));

					   BTF_ELF_SEC, PTR_ERR(obj->btf));

				obj->btf = NULL;

				obj->btf = NULL;

tools/lib/bpf/libbpf.map

+1 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,7 @@ LIBBPF_0.0.2 { 
		btf__get_map_kv_tids;

		btf__get_map_kv_tids;

		btf__get_nr_types;

		btf__get_nr_types;

		btf__get_strings;

		btf__get_strings;

		btf__load;

		btf_ext__free;

		btf_ext__free;

		btf_ext__func_info_rec_size;

		btf_ext__func_info_rec_size;

		btf_ext__line_info_rec_size;

		btf_ext__line_info_rec_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE