libbpf: Add bpf_obj_get_opts()
PATCH 1/1 libbpf: Add bpf_obj_get_opts()
From: Joe Burton <[email protected]>
Add an extensible variant of bpf_obj_get() capable of setting the file_flags parameter.
This parameter is needed to enable unprivileged access to BPF maps. Without a method like this, users must manually make the syscall.
Signed-off-by Joe Burton <[email protected]>
--- tools/lib/bpf/bpf.c | 10 ++++++++++ tools/lib/bpf/bpf.h | 9 +++++++++ 2 files changed, 19 insertions(+)
tools/lib/bpf/bpf.c +10 -0
@@ -578,12 +578,22 @@ int bpf_obj_pin(int fd, const char *pathname) }int bpf_obj_get (const char *pathname) +{ +LIBBPF_OPTS (bpf_obj_get_opts, opts); +return bpf_obj_get_opts (pathname, &opts); +} + +int bpf_obj_get_opts (const char *pathname,const struct bpf_obj_get_opts *opts) {union bpf_attr attr;int fd; +if (!OPTS_VALID (opts, bpf_obj_get_opts)) +return libbpf_err (-EINVAL ); +memset (&attr,0 ,sizeof (attr)); attr.pathname =ptr_to_u64 ((void *)pathname); + attr.file_flags =OPTS_GET (opts, file_flags,0 ); fd =sys_bpf_fd (BPF_OBJ_GET , &attr,sizeof (attr));return libbpf_err_errno (fd);
tools/lib/bpf/bpf.h +9 -0
@@ -270,8 +270,17 @@ LIBBPF_API int bpf_map_update_batch(int fd, const void *keys, const void *values__u32 *count, const struct bpf_map_batch_opts *opts); +struct bpf_obj_get_opts { +size_t sz;/* size of this struct for forward/backward compatibility */ + +__u32 file_flags; +}; +#define bpf_obj_get_opts__last_field file_flags + LIBBPF_API int bpf_obj_pin(int fd, const char *pathname); LIBBPF_API int bpf_obj_get(const char *pathname); +LIBBPF_API int bpf_obj_get_opts(const char *pathname, +const struct bpf_obj_get_opts *opts);struct bpf_prog_attach_opts {size_t sz;/* size of this struct for forward/backward compatibility */
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Quoted 6 lines · Joe Burton
From: Joe Burton <[email protected]>
Add an extensible variant of
bpf_obj_get()capable of setting thefile_flagsparameter.
Quoted 7 lines
This parameter is needed to enable unprivileged access to BPF maps. Without a method like this, users must manually make the syscall.
Signed-off-by Joe Burton <[email protected]>--- tools/lib/bpf/bpf.c | 10 ++++++++++ tools/lib/bpf/bpf.h | 9 +++++++++
Needs a libbpf.map change as well?
Quoted 54 lines
2 files changed, 19 insertions(+)tools/lib/bpf/bpf.c +10
-0@@ -578,12 +578,22 @@ int bpf_obj_pin(int fd, const char *pathname) }int bpf_obj_get (const char *pathname) +{ +LIBBPF_OPTS (bpf_obj_get_opts, opts); +return bpf_obj_get_opts (pathname, &opts); +} + +int bpf_obj_get_opts (const char *pathname,const struct bpf_obj_get_opts *opts) {union bpf_attr attr;int fd; +if (!OPTS_VALID (opts, bpf_obj_get_opts)) +return libbpf_err (-EINVAL ); +memset (&attr,0 ,sizeof (attr)); attr.pathname =ptr_to_u64 ((void *)pathname); + attr.file_flags =OPTS_GET (opts, file_flags,0 ); fd =sys_bpf_fd (BPF_OBJ_GET , &attr,sizeof (attr));return libbpf_err_errno (fd);tools/lib/bpf/bpf.h +9
-1@@ -270,8 +270,17 @@ LIBBPF_API int bpf_map_update_batch(int fd, const void *keys, const void *values__u32 *count, const struct bpf_map_batch_opts *opts); +struct bpf_obj_get_opts { +size_t sz;/* size of this struct for forward/backward compatibility */ + +__u32 file_flags; +}; +#define bpf_obj_get_opts__last_field file_flags + LIBBPF_API int bpf_obj_pin(int fd, const char *pathname); LIBBPF_API int bpf_obj_get(const char *pathname); +LIBBPF_API int bpf_obj_get_opts(const char *pathname, +const struct bpf_obj_get_opts *opts);struct bpf_prog_attach_opts {size_t sz;/* size of this struct for forward/backward compatibility */ --2.37.0.170.g444d1eabd0-goog
Quoted 1 line · Stanislav Fomichev
Needs a libbpf.map change as well?
Good catch. Done in v2. Sending the patch out in a moment.