Jakub Kicinski <jakub.kicin...@netronome.com> [Tue, 2018-07-10 14:43 -0700]:
> 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: Jakub Kicinski <jakub.kicin...@netronome.com>
> Reviewed-by: Quentin Monnet <quentin.mon...@netronome.com>
> ---
> v3 (Andrey):
> - put file path into the attr struct.
> ---
> tools/lib/bpf/libbpf.c | 26 ++++++++++++++++++++------
> tools/lib/bpf/libbpf.h | 6 ++++++
> 2 files changed, 26 insertions(+), 6 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 30992305f4c1..06cd534d2fba 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -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(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(path, NULL, 0, true);
> + 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;
>
> diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
> index 749acf58a5da..e911ad32d02e 100644
> --- a/tools/lib/bpf/libbpf.h
> +++ b/tools/lib/bpf/libbpf.h
> @@ -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);
> --
> 2.17.1
>
Acked-by: Andrey Ignatov <r...@fb.com>
--
Andrey Ignatov
