Commit 21703cf7 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'libbpf: error reporting changes for v1.0' 

Andrii Nakryiko says:

====================

Implement error reporting changes discussed in "Libbpf: the road to v1.0"
([0]) document.

Libbpf gets a new API, libbpf_set_strict_mode() which accepts a set of flags
that turn on a set of libbpf 1.0 changes, that might be potentially breaking.
It's possible to opt-in into all current and future 1.0 features by specifying
LIBBPF_STRICT_ALL flag.

When some of the 1.0 "features" are requested, libbpf APIs might behave
differently. In this patch set a first set of changes are implemented, all
related to the way libbpf returns errors. See individual patches for details.

Patch #1 adds a no-op libbpf_set_strict_mode() functionality to enable
updating selftests.

Patch #2 gets rid of all the bad code patterns that will break in libbpf 1.0
(exact -1 comparison for low-level APIs, direct IS_ERR() macro usage to check
pointer-returning APIs for error, etc). These changes make selftest work in
both legacy and 1.0 libbpf modes. Selftests also opt-in into 100% libbpf 1.0
mode to automatically gain all the subsequent changes, which will come in
follow up patches.

Patch #3 streamlines error reporting for low-level APIs wrapping bpf() syscall.

Patch #4 streamlines errors for all the rest APIs.

Patch #5 ensures that BPF skeletons propagate errors properly as well, as
currently on error some APIs will return NULL with no way of checking exact
error code.

  [0] https://docs.google.com/document/d/1UyjTZuPFWiPFyKk1tV5an11_iaRuec6U-ZESZ54nNTY



v1->v2:
  - move libbpf_set_strict_mode() implementation to patch #1, where it belongs
    (Alexei);
  - add acks, slight rewording of commit messages.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents a720a2a0 9c6c0449

tools/bpf/bpftool/gen.c

+18 −9
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ static int do_skeleton(int argc, char **argv) 
		#ifndef %2$s						    \n\

		#define %2$s						    \n\

									    \n\

		#include <errno.h>					    \n\

		#include <stdlib.h>					    \n\

		#include <bpf/libbpf.h>					    \n\

									    \n\
@@ -793,18 +794,23 @@ static int do_skeleton(int argc, char **argv) 
		%1$s__open_opts(const struct bpf_object_open_opts *opts)    \n\

		{							    \n\

			struct %1$s *obj;				    \n\

			int err;					    \n\

									    \n\

			obj = (struct %1$s *)calloc(1, sizeof(*obj));	    \n\

			if (!obj)					    \n\

			if (!obj) {					    \n\

				errno = ENOMEM;				    \n\

				return NULL;				    \n\

			if (%1$s__create_skeleton(obj))			    \n\

				goto err;				    \n\

			if (bpf_object__open_skeleton(obj->skeleton, opts)) \n\

				goto err;				    \n\

			}						    \n\

									    \n\

			err = %1$s__create_skeleton(obj);		    \n\

			err = err ?: bpf_object__open_skeleton(obj->skeleton, opts);\n\

			if (err)					    \n\

				goto err_out;				    \n\

									    \n\

			return obj;					    \n\

		err:							    \n\

		err_out:						    \n\

			%1$s__destroy(obj);				    \n\

			errno = -err;					    \n\

			return NULL;					    \n\

		}							    \n\

									    \n\
@@ -824,12 +830,15 @@ static int do_skeleton(int argc, char **argv) 
		%1$s__open_and_load(void)				    \n\

		{							    \n\

			struct %1$s *obj;				    \n\

			int err;					    \n\

									    \n\

			obj = %1$s__open();				    \n\

			if (!obj)					    \n\

				return NULL;				    \n\

			if (%1$s__load(obj)) {				    \n\

			err = %1$s__load(obj);				    \n\

			if (err) {					    \n\

				%1$s__destroy(obj);			    \n\

				errno = -err;				    \n\

				return NULL;				    \n\

			}						    \n\

			return obj;					    \n\
@@ -860,7 +869,7 @@ static int do_skeleton(int argc, char **argv) 
									    \n\

			s = (struct bpf_object_skeleton *)calloc(1, sizeof(*s));\n\

			if (!s)						    \n\

				return -1;				    \n\

				goto err;				    \n\

			obj->skeleton = s;				    \n\

									    \n\

			s->sz = sizeof(*s);				    \n\
@@ -949,7 +958,7 @@ static int do_skeleton(int argc, char **argv) 
			return 0;					    \n\

		err:							    \n\

			bpf_object__destroy_skeleton(s);		    \n\

			return -1;					    \n\

			return -ENOMEM;					    \n\

		}							    \n\

									    \n\

		#endif /* %s */						    \n\

tools/lib/bpf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ install_headers: $(BPF_HELPER_DEFS) 
		$(call do_install,libbpf.h,$(prefix)/include/bpf,644); \

		$(call do_install,btf.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf_common.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf_legacy.h,$(prefix)/include/bpf,644); \

		$(call do_install,xsk.h,$(prefix)/include/bpf,644); \

		$(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \

		$(call do_install,$(BPF_HELPER_DEFS),$(prefix)/include/bpf,644); \

tools/lib/bpf/bpf.c

+118 −50
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static inline int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size) 
int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)

{

	union bpf_attr attr;

	int fd;



	memset(&attr, '\0', sizeof(attr));
@@ -102,7 +103,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) 
	else

		attr.inner_map_fd = create_attr->inner_map_fd;



	return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

	fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
@@ -160,6 +162,7 @@ int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name, 
			       __u32 map_flags, int node)

{

	union bpf_attr attr;

	int fd;



	memset(&attr, '\0', sizeof(attr));
@@ -178,7 +181,8 @@ int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name, 
		attr.numa_node = node;

	}



	return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

	fd = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,
@@ -222,10 +226,10 @@ int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr) 
	int fd;



	if (!load_attr->log_buf != !load_attr->log_buf_sz)

		return -EINVAL;

		return libbpf_err(-EINVAL);



	if (load_attr->log_level > (4 | 2 | 1) || (load_attr->log_level && !load_attr->log_buf))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.prog_type = load_attr->prog_type;
@@ -281,8 +285,10 @@ int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr) 
							load_attr->func_info_cnt,

							load_attr->func_info_rec_size,

							attr.func_info_rec_size);

			if (!finfo)

			if (!finfo) {

				errno = E2BIG;

				goto done;

			}



			attr.func_info = ptr_to_u64(finfo);

			attr.func_info_rec_size = load_attr->func_info_rec_size;
@@ -293,8 +299,10 @@ int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr) 
							load_attr->line_info_cnt,

							load_attr->line_info_rec_size,

							attr.line_info_rec_size);

			if (!linfo)

			if (!linfo) {

				errno = E2BIG;

				goto done;

			}



			attr.line_info = ptr_to_u64(linfo);

			attr.line_info_rec_size = load_attr->line_info_rec_size;
@@ -318,9 +326,10 @@ int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr) 


	fd = sys_bpf_prog_load(&attr, sizeof(attr));

done:

	/* free() doesn't affect errno, so we don't need to restore it */

	free(finfo);

	free(linfo);

	return fd;

	return libbpf_err_errno(fd);

}



int bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr,
@@ -329,7 +338,7 @@ int bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr, 
	struct bpf_prog_load_params p = {};



	if (!load_attr || !log_buf != !log_buf_sz)

		return -EINVAL;

		return libbpf_err(-EINVAL);



	p.prog_type = load_attr->prog_type;

	p.expected_attach_type = load_attr->expected_attach_type;
@@ -391,6 +400,7 @@ int bpf_verify_program(enum bpf_prog_type type, const struct bpf_insn *insns, 
		       int log_level)

{

	union bpf_attr attr;

	int fd;



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

	attr.prog_type = type;
@@ -404,13 +414,15 @@ int bpf_verify_program(enum bpf_prog_type type, const struct bpf_insn *insns, 
	attr.kern_version = kern_version;

	attr.prog_flags = prog_flags;



	return sys_bpf_prog_load(&attr, sizeof(attr));

	fd = sys_bpf_prog_load(&attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_map_update_elem(int fd, const void *key, const void *value,

			__u64 flags)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;
@@ -418,24 +430,28 @@ int bpf_map_update_elem(int fd, const void *key, const void *value, 
	attr.value = ptr_to_u64(value);

	attr.flags = flags;



	return sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_lookup_elem(int fd, const void *key, void *value)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.value = ptr_to_u64(value);



	return sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_lookup_elem_flags(int fd, const void *key, void *value, __u64 flags)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;
@@ -443,19 +459,22 @@ int bpf_map_lookup_elem_flags(int fd, const void *key, void *value, __u64 flags) 
	attr.value = ptr_to_u64(value);

	attr.flags = flags;



	return sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.value = ptr_to_u64(value);



	return sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, __u64 flags)
@@ -474,34 +493,40 @@ int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, _ 
int bpf_map_delete_elem(int fd, const void *key)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);



	return sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_get_next_key(int fd, const void *key, void *next_key)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.next_key = ptr_to_u64(next_key);



	return sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_map_freeze(int fd)

{

	union bpf_attr attr;

	int ret;



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

	attr.map_fd = fd;



	return sys_bpf(BPF_MAP_FREEZE, &attr, sizeof(attr));

	ret = sys_bpf(BPF_MAP_FREEZE, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



static int bpf_map_batch_common(int cmd, int fd, void  *in_batch,
@@ -513,7 +538,7 @@ static int bpf_map_batch_common(int cmd, int fd, void *in_batch, 
	int ret;



	if (!OPTS_VALID(opts, bpf_map_batch_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.batch.map_fd = fd;
@@ -528,7 +553,7 @@ static int bpf_map_batch_common(int cmd, int fd, void *in_batch, 
	ret = sys_bpf(cmd, &attr, sizeof(attr));

	*count = attr.batch.count;



	return ret;

	return libbpf_err_errno(ret);

}



int bpf_map_delete_batch(int fd, void *keys, __u32 *count,
@@ -565,22 +590,26 @@ int bpf_map_update_batch(int fd, void *keys, void *values, __u32 *count, 
int bpf_obj_pin(int fd, const char *pathname)

{

	union bpf_attr attr;

	int ret;



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

	attr.pathname = ptr_to_u64((void *)pathname);

	attr.bpf_fd = fd;



	return sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));

	ret = sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_obj_get(const char *pathname)

{

	union bpf_attr attr;

	int fd;



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

	attr.pathname = ptr_to_u64((void *)pathname);



	return sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));

	fd = sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_prog_attach(int prog_fd, int target_fd, enum bpf_attach_type type,
@@ -598,9 +627,10 @@ int bpf_prog_attach_xattr(int prog_fd, int target_fd, 
			  const struct bpf_prog_attach_opts *opts)

{

	union bpf_attr attr;

	int ret;



	if (!OPTS_VALID(opts, bpf_prog_attach_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.target_fd	   = target_fd;
@@ -609,30 +639,35 @@ int bpf_prog_attach_xattr(int prog_fd, int target_fd, 
	attr.attach_flags  = OPTS_GET(opts, flags, 0);

	attr.replace_bpf_fd = OPTS_GET(opts, replace_prog_fd, 0);



	return sys_bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));

	ret = sys_bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_prog_detach(int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr;

	int ret;



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

	attr.target_fd	 = target_fd;

	attr.attach_type = type;



	return sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

	ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_prog_detach2(int prog_fd, int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr;

	int ret;



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

	attr.target_fd	 = target_fd;

	attr.attach_bpf_fd = prog_fd;

	attr.attach_type = type;



	return sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

	ret = sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_link_create(int prog_fd, int target_fd,
@@ -641,15 +676,16 @@ int bpf_link_create(int prog_fd, int target_fd, 
{

	__u32 target_btf_id, iter_info_len;

	union bpf_attr attr;

	int fd;



	if (!OPTS_VALID(opts, bpf_link_create_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



	iter_info_len = OPTS_GET(opts, iter_info_len, 0);

	target_btf_id = OPTS_GET(opts, target_btf_id, 0);



	if (iter_info_len && target_btf_id)

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.link_create.prog_fd = prog_fd;
@@ -665,26 +701,30 @@ int bpf_link_create(int prog_fd, int target_fd, 
		attr.link_create.target_btf_id = target_btf_id;

	}



	return sys_bpf(BPF_LINK_CREATE, &attr, sizeof(attr));

	fd = sys_bpf(BPF_LINK_CREATE, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_link_detach(int link_fd)

{

	union bpf_attr attr;

	int ret;



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

	attr.link_detach.link_fd = link_fd;



	return sys_bpf(BPF_LINK_DETACH, &attr, sizeof(attr));

	ret = sys_bpf(BPF_LINK_DETACH, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_link_update(int link_fd, int new_prog_fd,

		    const struct bpf_link_update_opts *opts)

{

	union bpf_attr attr;

	int ret;



	if (!OPTS_VALID(opts, bpf_link_update_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.link_update.link_fd = link_fd;
@@ -692,17 +732,20 @@ int bpf_link_update(int link_fd, int new_prog_fd, 
	attr.link_update.flags = OPTS_GET(opts, flags, 0);

	attr.link_update.old_prog_fd = OPTS_GET(opts, old_prog_fd, 0);



	return sys_bpf(BPF_LINK_UPDATE, &attr, sizeof(attr));

	ret = sys_bpf(BPF_LINK_UPDATE, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}



int bpf_iter_create(int link_fd)

{

	union bpf_attr attr;

	int fd;



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

	attr.iter_create.link_fd = link_fd;



	return sys_bpf(BPF_ITER_CREATE, &attr, sizeof(attr));

	fd = sys_bpf(BPF_ITER_CREATE, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,
@@ -719,10 +762,12 @@ int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags, 
	attr.query.prog_ids	= ptr_to_u64(prog_ids);



	ret = sys_bpf(BPF_PROG_QUERY, &attr, sizeof(attr));



	if (attach_flags)

		*attach_flags = attr.query.attach_flags;

	*prog_cnt = attr.query.prog_cnt;

	return ret;



	return libbpf_err_errno(ret);

}



int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,
@@ -740,13 +785,15 @@ int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size, 
	attr.test.repeat = repeat;



	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));



	if (size_out)

		*size_out = attr.test.data_size_out;

	if (retval)

		*retval = attr.test.retval;

	if (duration)

		*duration = attr.test.duration;

	return ret;



	return libbpf_err_errno(ret);

}



int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr)
@@ -755,7 +802,7 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) 
	int ret;



	if (!test_attr->data_out && test_attr->data_size_out > 0)

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.test.prog_fd = test_attr->prog_fd;
@@ -770,11 +817,13 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) 
	attr.test.repeat = test_attr->repeat;



	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));



	test_attr->data_size_out = attr.test.data_size_out;

	test_attr->ctx_size_out = attr.test.ctx_size_out;

	test_attr->retval = attr.test.retval;

	test_attr->duration = attr.test.duration;

	return ret;



	return libbpf_err_errno(ret);

}



int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts)
@@ -783,7 +832,7 @@ int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts) 
	int ret;



	if (!OPTS_VALID(opts, bpf_test_run_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.test.prog_fd = prog_fd;
@@ -801,11 +850,13 @@ int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts) 
	attr.test.data_out = ptr_to_u64(OPTS_GET(opts, data_out, NULL));



	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));



	OPTS_SET(opts, data_size_out, attr.test.data_size_out);

	OPTS_SET(opts, ctx_size_out, attr.test.ctx_size_out);

	OPTS_SET(opts, duration, attr.test.duration);

	OPTS_SET(opts, retval, attr.test.retval);

	return ret;



	return libbpf_err_errno(ret);

}



static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd)
@@ -820,7 +871,7 @@ static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd) 
	if (!err)

		*next_id = attr.next_id;



	return err;

	return libbpf_err_errno(err);

}



int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
@@ -846,41 +897,49 @@ int bpf_link_get_next_id(__u32 start_id, __u32 *next_id) 
int bpf_prog_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;

	int fd;



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

	attr.prog_id = id;



	return sys_bpf(BPF_PROG_GET_FD_BY_ID, &attr, sizeof(attr));

	fd = sys_bpf(BPF_PROG_GET_FD_BY_ID, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_map_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;

	int fd;



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

	attr.map_id = id;



	return sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, sizeof(attr));

	fd = sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_btf_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;

	int fd;



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

	attr.btf_id = id;



	return sys_bpf(BPF_BTF_GET_FD_BY_ID, &attr, sizeof(attr));

	fd = sys_bpf(BPF_BTF_GET_FD_BY_ID, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_link_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;

	int fd;



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

	attr.link_id = id;



	return sys_bpf(BPF_LINK_GET_FD_BY_ID, &attr, sizeof(attr));

	fd = sys_bpf(BPF_LINK_GET_FD_BY_ID, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len)
@@ -894,21 +953,24 @@ int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len) 
	attr.info.info = ptr_to_u64(info);



	err = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr));



	if (!err)

		*info_len = attr.info.info_len;



	return err;

	return libbpf_err_errno(err);

}



int bpf_raw_tracepoint_open(const char *name, int prog_fd)

{

	union bpf_attr attr;

	int fd;



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

	attr.raw_tracepoint.name = ptr_to_u64(name);

	attr.raw_tracepoint.prog_fd = prog_fd;



	return sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, sizeof(attr));

	fd = sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf, __u32 log_buf_size,
@@ -928,12 +990,13 @@ int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf, __u32 log_buf_s 
	}



	fd = sys_bpf(BPF_BTF_LOAD, &attr, sizeof(attr));

	if (fd == -1 && !do_log && log_buf && log_buf_size) {



	if (fd < 0 && !do_log && log_buf && log_buf_size) {

		do_log = true;

		goto retry;

	}



	return fd;

	return libbpf_err_errno(fd);

}



int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len,
@@ -950,37 +1013,42 @@ int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len, 
	attr.task_fd_query.buf_len = *buf_len;



	err = sys_bpf(BPF_TASK_FD_QUERY, &attr, sizeof(attr));



	*buf_len = attr.task_fd_query.buf_len;

	*prog_id = attr.task_fd_query.prog_id;

	*fd_type = attr.task_fd_query.fd_type;

	*probe_offset = attr.task_fd_query.probe_offset;

	*probe_addr = attr.task_fd_query.probe_addr;



	return err;

	return libbpf_err_errno(err);

}



int bpf_enable_stats(enum bpf_stats_type type)

{

	union bpf_attr attr;

	int fd;



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

	attr.enable_stats.type = type;



	return sys_bpf(BPF_ENABLE_STATS, &attr, sizeof(attr));

	fd = sys_bpf(BPF_ENABLE_STATS, &attr, sizeof(attr));

	return libbpf_err_errno(fd);

}



int bpf_prog_bind_map(int prog_fd, int map_fd,

		      const struct bpf_prog_bind_opts *opts)

{

	union bpf_attr attr;

	int ret;



	if (!OPTS_VALID(opts, bpf_prog_bind_opts))

		return -EINVAL;

		return libbpf_err(-EINVAL);



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

	attr.prog_bind_map.prog_fd = prog_fd;

	attr.prog_bind_map.map_fd = map_fd;

	attr.prog_bind_map.flags = OPTS_GET(opts, flags, 0);



	return sys_bpf(BPF_PROG_BIND_MAP, &attr, sizeof(attr));

	ret = sys_bpf(BPF_PROG_BIND_MAP, &attr, sizeof(attr));

	return libbpf_err_errno(ret);

}

tools/lib/bpf/bpf_prog_linfo.c

+9 −9
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info) 
	nr_linfo = info->nr_line_info;



	if (!nr_linfo)

		return NULL;

		return errno = EINVAL, NULL;



	/*

	 * The min size that bpf_prog_linfo has to access for
@@ -114,11 +114,11 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info) 
	 */

	if (info->line_info_rec_size <

	    offsetof(struct bpf_line_info, file_name_off))

		return NULL;

		return errno = EINVAL, NULL;



	prog_linfo = calloc(1, sizeof(*prog_linfo));

	if (!prog_linfo)

		return NULL;

		return errno = ENOMEM, NULL;



	/* Copy xlated line_info */

	prog_linfo->nr_linfo = nr_linfo;
@@ -174,7 +174,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info) 


err_free:

	bpf_prog_linfo__free(prog_linfo);

	return NULL;

	return errno = EINVAL, NULL;

}



const struct bpf_line_info *
@@ -186,11 +186,11 @@ bpf_prog_linfo__lfind_addr_func(const struct bpf_prog_linfo *prog_linfo, 
	const __u64 *jited_linfo;



	if (func_idx >= prog_linfo->nr_jited_func)

		return NULL;

		return errno = ENOENT, NULL;



	nr_linfo = prog_linfo->nr_jited_linfo_per_func[func_idx];

	if (nr_skip >= nr_linfo)

		return NULL;

		return errno = ENOENT, NULL;



	start = prog_linfo->jited_linfo_func_idx[func_idx] + nr_skip;

	jited_rec_size = prog_linfo->jited_rec_size;
@@ -198,7 +198,7 @@ bpf_prog_linfo__lfind_addr_func(const struct bpf_prog_linfo *prog_linfo, 
		(start * jited_rec_size);

	jited_linfo = raw_jited_linfo;

	if (addr < *jited_linfo)

		return NULL;

		return errno = ENOENT, NULL;



	nr_linfo -= nr_skip;

	rec_size = prog_linfo->rec_size;
@@ -225,13 +225,13 @@ bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo, 


	nr_linfo = prog_linfo->nr_linfo;

	if (nr_skip >= nr_linfo)

		return NULL;

		return errno = ENOENT, NULL;



	rec_size = prog_linfo->rec_size;

	raw_linfo = prog_linfo->raw_linfo + (nr_skip * rec_size);

	linfo = raw_linfo;

	if (insn_off < linfo->insn_off)

		return NULL;

		return errno = ENOENT, NULL;



	nr_linfo -= nr_skip;

	for (i = 0; i < nr_linfo; i++) {

tools/lib/bpf/btf.c

+152 −150

File changed.

Preview size limit exceeded, changes collapsed.