Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07f2d4ea authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

tools: libbpf: add extended attributes version of bpf_object__open() 



Similarly to bpf_prog_load() users of bpf_object__open() may need
to specify the expected program type.  Program type is needed at
open to avoid the kernel version check for program types which don't
require it.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent f83fb22c

tools/lib/bpf/libbpf.c

+20 −6
Original line number Diff line number Diff line
@@ -1520,15 +1520,26 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, 
	return ERR_PTR(err);

}



struct bpf_object *bpf_object__open(const char *path)

struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr)

{

	/* param validation */

	if (!path)

	if (!attr->file)

		return NULL;



	pr_debug("loading %s\n", path);

	pr_debug("loading %s\n", attr->file);



	return __bpf_object__open(path, NULL, 0, true);

	return __bpf_object__open(attr->file, NULL, 0,

				  bpf_prog_type__needs_kver(attr->prog_type));

}



struct bpf_object *bpf_object__open(const char *path)

{

	struct bpf_object_open_attr attr = {

		.file		= path,

		.prog_type	= BPF_PROG_TYPE_UNSPEC,

	};



	return bpf_object__open_xattr(&attr);

}



struct bpf_object *bpf_object__open_buffer(void *obj_buf,
@@ -2238,6 +2249,10 @@ int bpf_prog_load(const char *file, enum bpf_prog_type type, 
int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,

			struct bpf_object **pobj, int *prog_fd)

{

	struct bpf_object_open_attr open_attr = {

		.file		= attr->file,

		.prog_type	= attr->prog_type,

	};

	struct bpf_program *prog, *first_prog = NULL;

	enum bpf_attach_type expected_attach_type;

	enum bpf_prog_type prog_type;
@@ -2250,8 +2265,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, 
	if (!attr->file)

		return -EINVAL;



	obj = __bpf_object__open(attr->file, NULL, 0,

				 bpf_prog_type__needs_kver(attr->prog_type));

	obj = bpf_object__open_xattr(&open_attr);

	if (IS_ERR_OR_NULL(obj))

		return -ENOENT;

tools/lib/bpf/libbpf.h

+6 −0
Original line number Diff line number Diff line
@@ -66,7 +66,13 @@ void libbpf_set_print(libbpf_print_fn_t warn, 
/* Hide internal to user */

struct bpf_object;



struct bpf_object_open_attr {

	const char *file;

	enum bpf_prog_type prog_type;

};



struct bpf_object *bpf_object__open(const char *path);

struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr);

struct bpf_object *bpf_object__open_buffer(void *obj_buf,

					   size_t obj_buf_sz,

					   const char *name);