hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libbpf: Refactor bpf_object__open APIs to use common opts 

Refactor all the various bpf_object__open variations to ultimately
specify common bpf_object_open_opts struct. This makes it easy to keep
extending this common struct w/ extra parameters without having to
update all the legacy APIs.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20191015182849.3922287-3-andriin@fb.com
This commit is contained in:
Andrii Nakryiko 2019-10-15 11:28:46 -07:00 committed by Alexei Starovoitov
parent 511bb0085c
commit 291ee02b5e
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
tools/lib/bpf/libbpf.c
View File

@ -1322,9 +1322,9 @@ static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict)
return 0; return 0;
} }
static int bpf_object__init_maps(struct bpf_object *obj, int flags) static int bpf_object__init_maps(struct bpf_object *obj, bool relaxed_maps)
{ {
bool strict = !(flags & MAPS_RELAX_COMPAT); bool strict = !relaxed_maps;
int err; int err;
err = bpf_object__init_user_maps(obj, strict); err = bpf_object__init_user_maps(obj, strict);
@ -1521,7 +1521,7 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)
return 0; return 0;
} }
static int bpf_object__elf_collect(struct bpf_object *obj, int flags) static int bpf_object__elf_collect(struct bpf_object *obj, bool relaxed_maps)
{ {
Elf *elf = obj->efile.elf; Elf *elf = obj->efile.elf;
GElf_Ehdr *ep = &obj->efile.ehdr; GElf_Ehdr *ep = &obj->efile.ehdr;
@ -1652,7 +1652,7 @@ static int bpf_object__elf_collect(struct bpf_object *obj, int flags)
} }
err = bpf_object__init_btf(obj, btf_data, btf_ext_data); err = bpf_object__init_btf(obj, btf_data, btf_ext_data);
if (!err) if (!err)
err = bpf_object__init_maps(obj, flags); err = bpf_object__init_maps(obj, relaxed_maps);
if (!err) if (!err)
err = bpf_object__sanitize_and_load_btf(obj); err = bpf_object__sanitize_and_load_btf(obj);
if (!err) if (!err)
@ -3554,24 +3554,45 @@ bpf_object__load_progs(struct bpf_object *obj, int log_level)
static struct bpf_object * static struct bpf_object *
__bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, __bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz,
const char *obj_name, int flags) struct bpf_object_open_opts *opts)
{ {
struct bpf_object *obj; struct bpf_object *obj;
const char *obj_name;
char tmp_name[64];
bool relaxed_maps;
int err; int err;
if (elf_version(EV_CURRENT) == EV_NONE) { if (elf_version(EV_CURRENT) == EV_NONE) {
pr_warning("failed to init libelf for %s\n", path); pr_warning("failed to init libelf for %s\n",
path ? : "(mem buf)");
return ERR_PTR(-LIBBPF_ERRNO__LIBELF); return ERR_PTR(-LIBBPF_ERRNO__LIBELF);
} }
if (!OPTS_VALID(opts, bpf_object_open_opts))
return ERR_PTR(-EINVAL);
obj_name = OPTS_GET(opts, object_name, path);
if (obj_buf) {
if (!obj_name) {
snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
(unsigned long)obj_buf,
(unsigned long)obj_buf_sz);
obj_name = tmp_name;
}
path = obj_name;
pr_debug("loading object '%s' from buffer\n", obj_name);
}
obj = bpf_object__new(path, obj_buf, obj_buf_sz, obj_name); obj = bpf_object__new(path, obj_buf, obj_buf_sz, obj_name);
if (IS_ERR(obj)) if (IS_ERR(obj))
return obj; return obj;
relaxed_maps = OPTS_GET(opts, relaxed_maps, false);
CHECK_ERR(bpf_object__elf_init(obj), err, out); CHECK_ERR(bpf_object__elf_init(obj), err, out);
CHECK_ERR(bpf_object__check_endianness(obj), err, out); CHECK_ERR(bpf_object__check_endianness(obj), err, out);
CHECK_ERR(bpf_object__probe_caps(obj), err, out); CHECK_ERR(bpf_object__probe_caps(obj), err, out);
CHECK_ERR(bpf_object__elf_collect(obj, flags), err, out); CHECK_ERR(bpf_object__elf_collect(obj, relaxed_maps), err, out);
CHECK_ERR(bpf_object__collect_reloc(obj), err, out); CHECK_ERR(bpf_object__collect_reloc(obj), err, out);
bpf_object__elf_finish(obj); bpf_object__elf_finish(obj);
@ -3584,13 +3605,16 @@ out:
static struct bpf_object * static struct bpf_object *
__bpf_object__open_xattr(struct bpf_object_open_attr *attr, int flags) __bpf_object__open_xattr(struct bpf_object_open_attr *attr, int flags)
{ {
LIBBPF_OPTS(bpf_object_open_opts, opts,
.relaxed_maps = flags & MAPS_RELAX_COMPAT,
);
/* param validation */ /* param validation */
if (!attr->file) if (!attr->file)
return NULL; return NULL;
pr_debug("loading %s\n", attr->file); pr_debug("loading %s\n", attr->file);
return __bpf_object__open(attr->file, NULL, 0, &opts);
return __bpf_object__open(attr->file, NULL, 0, NULL, flags);
} }
struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr) struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr)
@ -3611,47 +3635,22 @@ struct bpf_object *bpf_object__open(const char *path)
struct bpf_object * struct bpf_object *
bpf_object__open_file(const char *path, struct bpf_object_open_opts *opts) bpf_object__open_file(const char *path, struct bpf_object_open_opts *opts)
{ {
const char *obj_name;
bool relaxed_maps;
if (!OPTS_VALID(opts, bpf_object_open_opts))
return ERR_PTR(-EINVAL);
if (!path) if (!path)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
pr_debug("loading %s\n", path); pr_debug("loading %s\n", path);
obj_name = OPTS_GET(opts, object_name, path); return __bpf_object__open(path, NULL, 0, opts);
relaxed_maps = OPTS_GET(opts, relaxed_maps, false);
return __bpf_object__open(path, NULL, 0, obj_name,
relaxed_maps ? MAPS_RELAX_COMPAT : 0);
} }
struct bpf_object * struct bpf_object *
bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz, bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,
struct bpf_object_open_opts *opts) struct bpf_object_open_opts *opts)
{ {
char tmp_name[64];
const char *obj_name;
bool relaxed_maps;
if (!OPTS_VALID(opts, bpf_object_open_opts))
return ERR_PTR(-EINVAL);
if (!obj_buf || obj_buf_sz == 0) if (!obj_buf || obj_buf_sz == 0)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
obj_name = OPTS_GET(opts, object_name, NULL); return __bpf_object__open(NULL, obj_buf, obj_buf_sz, opts);
if (!obj_name) {
snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
(unsigned long)obj_buf,
(unsigned long)obj_buf_sz);
obj_name = tmp_name;
}
pr_debug("loading object '%s' from buffer\n", obj_name);
relaxed_maps = OPTS_GET(opts, relaxed_maps, false);
return __bpf_object__open(obj_name, obj_buf, obj_buf_sz, obj_name,
relaxed_maps ? MAPS_RELAX_COMPAT : 0);
} }
struct bpf_object * struct bpf_object *