Commit 38f0408e authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Andrii Nakryiko
Browse files

bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd() 



Use the new type-safe wrappers around bpf_obj_get_info_by_fd().

Split the bpf_obj_get_info_by_fd() call in build_btf_type_table() in
two, since knowing the type helps with the Memory Sanitizer.

Improve map_parse_fd_and_info() type safety by using
struct bpf_map_info * instead of void * for info.

Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarQuentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20230214231221.249277-4-iii@linux.ibm.com
parent 629dfc66

tools/bpf/bpftool/btf.c

+8 −5
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static bool btf_is_kernel_module(__u32 btf_id) 
	len = sizeof(btf_info);

	btf_info.name = ptr_to_u64(btf_name);

	btf_info.name_len = sizeof(btf_name);

	err = bpf_obj_get_info_by_fd(btf_fd, &btf_info, &len);

	err = bpf_btf_get_info_by_fd(btf_fd, &btf_info, &len);

	close(btf_fd);

	if (err) {

		p_err("can't get BTF (ID %u) object info: %s", btf_id, strerror(errno));
@@ -606,7 +606,7 @@ static int do_dump(int argc, char **argv) 
		if (fd < 0)

			return -1;



		err = bpf_obj_get_info_by_fd(fd, &info, &len);

		err = bpf_prog_get_info_by_fd(fd, &info, &len);

		if (err) {

			p_err("can't get prog info: %s", strerror(errno));

			goto done;
@@ -789,7 +789,10 @@ build_btf_type_table(struct hashmap *tab, enum bpf_obj_type type, 
		}



		memset(info, 0, *len);

		err = bpf_obj_get_info_by_fd(fd, info, len);

		if (type == BPF_OBJ_PROG)

			err = bpf_prog_get_info_by_fd(fd, info, len);

		else

			err = bpf_map_get_info_by_fd(fd, info, len);

		close(fd);

		if (err) {

			p_err("can't get %s info: %s", names[type],
@@ -931,7 +934,7 @@ show_btf(int fd, struct hashmap *btf_prog_table, 
	int err;



	memset(&info, 0, sizeof(info));

	err = bpf_obj_get_info_by_fd(fd, &info, &len);

	err = bpf_btf_get_info_by_fd(fd, &info, &len);

	if (err) {

		p_err("can't get BTF object info: %s", strerror(errno));

		return -1;
@@ -943,7 +946,7 @@ show_btf(int fd, struct hashmap *btf_prog_table, 
		info.name = ptr_to_u64(name);

		len = sizeof(info);



		err = bpf_obj_get_info_by_fd(fd, &info, &len);

		err = bpf_btf_get_info_by_fd(fd, &info, &len);

		if (err) {

			p_err("can't get BTF object info: %s", strerror(errno));

			return -1;

tools/bpf/bpftool/btf_dumper.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d, 
	if (prog_fd < 0)

		goto print;



	err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);

	err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);

	if (err)

		goto print;
@@ -70,7 +70,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d, 
	info.func_info_rec_size = finfo_rec_size;

	info.func_info = ptr_to_u64(&finfo);



	err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);

	err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);

	if (err)

		goto print;

tools/bpf/bpftool/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void guess_vmlinux_btf_id(__u32 attach_btf_obj_id) 
	if (fd < 0)

		return;



	err = bpf_obj_get_info_by_fd(fd, &btf_info, &btf_len);

	err = bpf_btf_get_info_by_fd(fd, &btf_info, &btf_len);

	if (err)

		goto out;
@@ -108,7 +108,7 @@ static int show_bpf_prog(int id, enum bpf_attach_type attach_type, 
	if (prog_fd < 0)

		return -1;



	if (bpf_obj_get_info_by_fd(prog_fd, &info, &info_len)) {

	if (bpf_prog_get_info_by_fd(prog_fd, &info, &info_len)) {

		close(prog_fd);

		return -1;

	}

tools/bpf/bpftool/common.c

+7 −6
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void get_prog_full_name(const struct bpf_prog_info *prog_info, int prog_fd, 
		info.func_info_rec_size = sizeof(finfo);

	info.func_info = ptr_to_u64(&finfo);



	if (bpf_obj_get_info_by_fd(prog_fd, &info, &info_len))

	if (bpf_prog_get_info_by_fd(prog_fd, &info, &info_len))

		goto copy_name;



	prog_btf = btf__load_from_kernel_by_id(info.btf_id);
@@ -488,7 +488,7 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb, 
		goto out_close;



	memset(&pinned_info, 0, sizeof(pinned_info));

	if (bpf_obj_get_info_by_fd(fd, &pinned_info, &len))

	if (bpf_prog_get_info_by_fd(fd, &pinned_info, &len))

		goto out_close;



	path = strdup(fpath);
@@ -756,7 +756,7 @@ static int prog_fd_by_nametag(void *nametag, int **fds, bool tag) 
			goto err_close_fds;

		}



		err = bpf_obj_get_info_by_fd(fd, &info, &len);

		err = bpf_prog_get_info_by_fd(fd, &info, &len);

		if (err) {

			p_err("can't get prog info (%u): %s",

			      id, strerror(errno));
@@ -916,7 +916,7 @@ static int map_fd_by_name(char *name, int **fds) 
			goto err_close_fds;

		}



		err = bpf_obj_get_info_by_fd(fd, &info, &len);

		err = bpf_map_get_info_by_fd(fd, &info, &len);

		if (err) {

			p_err("can't get map info (%u): %s",

			      id, strerror(errno));
@@ -1026,7 +1026,8 @@ int map_parse_fd(int *argc, char ***argv) 
	return fd;

}



int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len)

int map_parse_fd_and_info(int *argc, char ***argv, struct bpf_map_info *info,

			  __u32 *info_len)

{

	int err;

	int fd;
@@ -1035,7 +1036,7 @@ int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len) 
	if (fd < 0)

		return -1;



	err = bpf_obj_get_info_by_fd(fd, info, info_len);

	err = bpf_map_get_info_by_fd(fd, info, info_len);

	if (err) {

		p_err("can't get map info: %s", strerror(errno));

		close(fd);

tools/bpf/bpftool/link.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int get_prog_info(int prog_id, struct bpf_prog_info *info) 
		return prog_fd;



	memset(info, 0, sizeof(*info));

	err = bpf_obj_get_info_by_fd(prog_fd, info, &len);

	err = bpf_prog_get_info_by_fd(prog_fd, info, &len);

	if (err)

		p_err("can't get prog info: %s", strerror(errno));

	close(prog_fd);
@@ -327,7 +327,7 @@ static int do_show_link(int fd) 


	memset(&info, 0, sizeof(info));

again:

	err = bpf_obj_get_info_by_fd(fd, &info, &len);

	err = bpf_link_get_info_by_fd(fd, &info, &len);

	if (err) {

		p_err("can't get link info: %s",

		      strerror(errno));