* [PATCH bpf-next 0/2] Add new-style bpf_object__open APIs
@ 2019-10-04 3:00 Andrii Nakryiko
2019-10-04 3:00 ` [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users Andrii Nakryiko
2019-10-04 3:00 ` [PATCH bpf-next 2/2] libbpf: add bpf_object__open_{file,mem} w/ extensible opts Andrii Nakryiko
0 siblings, 2 replies; 10+ messages in thread
From: Andrii Nakryiko @ 2019-10-04 3:00 UTC (permalink / raw)
To: bpf, netdev, ast, daniel; +Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko
Add bpf_object__open_file() and bpf_object__open_mem() APIs that use a new
approach to providing future-proof non-ABI-breaking API changes. It relies on
APIs accepting optional self-describing "opts" struct, containing its own
size, filled out and provided by potentially outdated (as well as
newer-than-libbpf) user application. A set of internal helper macros
(OPTS_VALID, OPTS_HAS, and OPTS_GET) streamline and simplify a graceful
handling forward and backward compatibility for user applications dynamically
linked against different versions of libbpf shared library.
Users of libbpf are provided with convenience macro LIBBPF_OPTS that takes
care of populating correct structure size and zero-initializes options struct,
which helps avoid obscure issues of unitialized padding. Uninitialized padding
in a struct might turn into garbage-populated new fields understood by future
versions of libbpf.
Andrii Nakryiko (2):
libbpf: stop enforcing kern_version, populate it for users
libbpf: add bpf_object__open_{file,mem} w/ extensible opts
tools/lib/bpf/libbpf.c | 128 +++++++++---------
tools/lib/bpf/libbpf.h | 37 ++++-
tools/lib/bpf/libbpf.map | 3 +
tools/lib/bpf/libbpf_internal.h | 31 +++++
.../selftests/bpf/progs/test_attach_probe.c | 1 -
.../bpf/progs/test_get_stack_rawtp.c | 1 -
.../selftests/bpf/progs/test_perf_buffer.c | 1 -
.../selftests/bpf/progs/test_stacktrace_map.c | 1 -
8 files changed, 131 insertions(+), 72 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 3:00 [PATCH bpf-next 0/2] Add new-style bpf_object__open APIs Andrii Nakryiko @ 2019-10-04 3:00 ` Andrii Nakryiko 2019-10-04 14:05 ` John Fastabend 2019-10-04 3:00 ` [PATCH bpf-next 2/2] libbpf: add bpf_object__open_{file,mem} w/ extensible opts Andrii Nakryiko 1 sibling, 1 reply; 10+ messages in thread From: Andrii Nakryiko @ 2019-10-04 3:00 UTC (permalink / raw) To: bpf, netdev, ast, daniel; +Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko Kernel version enforcement for kprobes/kretprobes was removed from 5.0 kernel in 6c4fc209fcf9 ("bpf: remove useless version check for prog load"). Since then, BPF programs were specifying SEC("version") just to please libbpf. We should stop enforcing this in libbpf, if even kernel doesn't care. Furthermore, libbpf now will pre-populate current kernel version of the host system, in case we are still running on old kernel. This patch also removes __bpf_object__open_xattr from libbpf.h, as nothing in libbpf is relying on having it in that header. That function was never exported as LIBBPF_API and even name suggests its internal version. So this should be safe to remove, as it doesn't break ABI. Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- tools/lib/bpf/libbpf.c | 79 ++++++------------- tools/lib/bpf/libbpf.h | 2 - .../selftests/bpf/progs/test_attach_probe.c | 1 - .../bpf/progs/test_get_stack_rawtp.c | 1 - .../selftests/bpf/progs/test_perf_buffer.c | 1 - .../selftests/bpf/progs/test_stacktrace_map.c | 1 - 6 files changed, 22 insertions(+), 63 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e0276520171b..056769ce4fd0 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -33,6 +33,7 @@ #include <linux/limits.h> #include <linux/perf_event.h> #include <linux/ring_buffer.h> +#include <linux/version.h> #include <sys/epoll.h> #include <sys/ioctl.h> #include <sys/mman.h> @@ -255,7 +256,7 @@ struct bpf_object { */ struct { int fd; - void *obj_buf; + const void *obj_buf; size_t obj_buf_sz; Elf *elf; GElf_Ehdr ehdr; @@ -491,8 +492,19 @@ bpf_object__init_prog_names(struct bpf_object *obj) return 0; } +static __u32 get_kernel_version(void) +{ + __u32 major, minor, patch; + struct utsname info; + + uname(&info); + if (sscanf(info.release, "%u.%u.%u", &major, &minor, &patch) != 3) + return 0; + return KERNEL_VERSION(major, minor, patch); +} + static struct bpf_object *bpf_object__new(const char *path, - void *obj_buf, + const void *obj_buf, size_t obj_buf_sz) { struct bpf_object *obj; @@ -526,6 +538,7 @@ static struct bpf_object *bpf_object__new(const char *path, obj->efile.rodata_shndx = -1; obj->efile.bss_shndx = -1; + obj->kern_version = get_kernel_version(); obj->loaded = false; INIT_LIST_HEAD(&obj->list); @@ -569,7 +582,7 @@ static int bpf_object__elf_init(struct bpf_object *obj) * obj_buf should have been validated by * bpf_object__open_buffer(). */ - obj->efile.elf = elf_memory(obj->efile.obj_buf, + obj->efile.elf = elf_memory((char *)obj->efile.obj_buf, obj->efile.obj_buf_sz); } else { obj->efile.fd = open(obj->path, O_RDONLY); @@ -3551,54 +3564,9 @@ bpf_object__load_progs(struct bpf_object *obj, int log_level) return 0; } -static bool bpf_prog_type__needs_kver(enum bpf_prog_type type) -{ - switch (type) { - case BPF_PROG_TYPE_SOCKET_FILTER: - case BPF_PROG_TYPE_SCHED_CLS: - case BPF_PROG_TYPE_SCHED_ACT: - case BPF_PROG_TYPE_XDP: - case BPF_PROG_TYPE_CGROUP_SKB: - case BPF_PROG_TYPE_CGROUP_SOCK: - case BPF_PROG_TYPE_LWT_IN: - case BPF_PROG_TYPE_LWT_OUT: - case BPF_PROG_TYPE_LWT_XMIT: - case BPF_PROG_TYPE_LWT_SEG6LOCAL: - case BPF_PROG_TYPE_SOCK_OPS: - case BPF_PROG_TYPE_SK_SKB: - case BPF_PROG_TYPE_CGROUP_DEVICE: - case BPF_PROG_TYPE_SK_MSG: - case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: - case BPF_PROG_TYPE_LIRC_MODE2: - case BPF_PROG_TYPE_SK_REUSEPORT: - case BPF_PROG_TYPE_FLOW_DISSECTOR: - case BPF_PROG_TYPE_UNSPEC: - case BPF_PROG_TYPE_TRACEPOINT: - case BPF_PROG_TYPE_RAW_TRACEPOINT: - case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE: - case BPF_PROG_TYPE_PERF_EVENT: - case BPF_PROG_TYPE_CGROUP_SYSCTL: - case BPF_PROG_TYPE_CGROUP_SOCKOPT: - return false; - case BPF_PROG_TYPE_KPROBE: - default: - return true; - } -} - -static int bpf_object__validate(struct bpf_object *obj, bool needs_kver) -{ - if (needs_kver && obj->kern_version == 0) { - pr_warning("%s doesn't provide kernel version\n", - obj->path); - return -LIBBPF_ERRNO__KVERSION; - } - return 0; -} - static struct bpf_object * -__bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, - bool needs_kver, int flags) +__bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, + int flags) { struct bpf_object *obj; int err; @@ -3617,7 +3585,6 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, CHECK_ERR(bpf_object__probe_caps(obj), err, out); CHECK_ERR(bpf_object__elf_collect(obj, flags), err, out); CHECK_ERR(bpf_object__collect_reloc(obj), err, out); - CHECK_ERR(bpf_object__validate(obj, needs_kver), err, out); bpf_object__elf_finish(obj); return obj; @@ -3626,8 +3593,8 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, return ERR_PTR(err); } -struct bpf_object *__bpf_object__open_xattr(struct bpf_object_open_attr *attr, - int flags) +static struct bpf_object * +__bpf_object__open_xattr(struct bpf_object_open_attr *attr, int flags) { /* param validation */ if (!attr->file) @@ -3635,9 +3602,7 @@ struct bpf_object *__bpf_object__open_xattr(struct bpf_object_open_attr *attr, pr_debug("loading %s\n", attr->file); - return __bpf_object__open(attr->file, NULL, 0, - bpf_prog_type__needs_kver(attr->prog_type), - flags); + return __bpf_object__open(attr->file, NULL, 0, flags); } struct bpf_object *bpf_object__open_xattr(struct bpf_object_open_attr *attr) @@ -3673,7 +3638,7 @@ struct bpf_object *bpf_object__open_buffer(void *obj_buf, } pr_debug("loading object '%s' from buffer\n", name); - return __bpf_object__open(name, obj_buf, obj_buf_sz, true, true); + return __bpf_object__open(name, obj_buf, obj_buf_sz, true); } int bpf_object__unload(struct bpf_object *obj) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index e8f70977d137..2905dffd70b2 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -70,8 +70,6 @@ struct bpf_object_open_attr { LIBBPF_API struct bpf_object *bpf_object__open(const char *path); LIBBPF_API 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, - int flags); LIBBPF_API struct bpf_object *bpf_object__open_buffer(void *obj_buf, size_t obj_buf_sz, const char *name); diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c index 63a8dfef893b..534621e38906 100644 --- a/tools/testing/selftests/bpf/progs/test_attach_probe.c +++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c @@ -49,4 +49,3 @@ int handle_uprobe_return(struct pt_regs *ctx) } char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; diff --git a/tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c b/tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c index f8ffa3f3d44b..736b6955bba7 100644 --- a/tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c +++ b/tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c @@ -100,4 +100,3 @@ int bpf_prog1(void *ctx) } char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; /* ignored by tracepoints, required by libbpf.a */ diff --git a/tools/testing/selftests/bpf/progs/test_perf_buffer.c b/tools/testing/selftests/bpf/progs/test_perf_buffer.c index 876c27deb65a..07c09ca5546a 100644 --- a/tools/testing/selftests/bpf/progs/test_perf_buffer.c +++ b/tools/testing/selftests/bpf/progs/test_perf_buffer.c @@ -22,4 +22,3 @@ int handle_sys_nanosleep_entry(struct pt_regs *ctx) } char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; diff --git a/tools/testing/selftests/bpf/progs/test_stacktrace_map.c b/tools/testing/selftests/bpf/progs/test_stacktrace_map.c index fa0be3e10a10..3b7e1dca8829 100644 --- a/tools/testing/selftests/bpf/progs/test_stacktrace_map.c +++ b/tools/testing/selftests/bpf/progs/test_stacktrace_map.c @@ -74,4 +74,3 @@ int oncpu(struct sched_switch_args *ctx) } char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; /* ignored by tracepoints, required by libbpf.a */ -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 3:00 ` [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users Andrii Nakryiko @ 2019-10-04 14:05 ` John Fastabend 2019-10-04 14:32 ` Andrii Nakryiko 0 siblings, 1 reply; 10+ messages in thread From: John Fastabend @ 2019-10-04 14:05 UTC (permalink / raw) To: Andrii Nakryiko, bpf, netdev, ast, daniel Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko Andrii Nakryiko wrote: > Kernel version enforcement for kprobes/kretprobes was removed from > 5.0 kernel in 6c4fc209fcf9 ("bpf: remove useless version check for prog load"). > Since then, BPF programs were specifying SEC("version") just to please > libbpf. We should stop enforcing this in libbpf, if even kernel doesn't > care. Furthermore, libbpf now will pre-populate current kernel version > of the host system, in case we are still running on old kernel. > > This patch also removes __bpf_object__open_xattr from libbpf.h, as > nothing in libbpf is relying on having it in that header. That function > was never exported as LIBBPF_API and even name suggests its internal > version. So this should be safe to remove, as it doesn't break ABI. > > Signed-off-by: Andrii Nakryiko <andriin@fb.com> > --- > tools/lib/bpf/libbpf.c | 79 ++++++------------- > tools/lib/bpf/libbpf.h | 2 - > .../selftests/bpf/progs/test_attach_probe.c | 1 - > .../bpf/progs/test_get_stack_rawtp.c | 1 - > .../selftests/bpf/progs/test_perf_buffer.c | 1 - > .../selftests/bpf/progs/test_stacktrace_map.c | 1 - > 6 files changed, 22 insertions(+), 63 deletions(-) [...] > static struct bpf_object * > -__bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > - bool needs_kver, int flags) > +__bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, > + int flags) > { > struct bpf_object *obj; > int err; > @@ -3617,7 +3585,6 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > CHECK_ERR(bpf_object__probe_caps(obj), err, out); > CHECK_ERR(bpf_object__elf_collect(obj, flags), err, out); If we are not going to validate the section should we also skip collect'ing it? diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e0276520171b..22a458cd602c 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1567,12 +1567,6 @@ static int bpf_object__elf_collect(struct bpf_object *obj, int flags) data->d_size); if (err) return err; - } else if (strcmp(name, "version") == 0) { - err = bpf_object__init_kversion(obj, - data->d_buf, - data->d_size); - if (err) - return err; } else if (strcmp(name, "maps") == 0) { obj->efile.maps_shndx = idx; } else if (strcmp(name, MAPS_ELF_SEC) == 0) { > CHECK_ERR(bpf_object__collect_reloc(obj), err, out); > - CHECK_ERR(bpf_object__validate(obj, needs_kver), err, out); > > bpf_object__elf_finish(obj); > return obj; > @@ -3626,8 +3593,8 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > return ERR_PTR(err); > } ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 14:05 ` John Fastabend @ 2019-10-04 14:32 ` Andrii Nakryiko 2019-10-04 14:36 ` Alexei Starovoitov 0 siblings, 1 reply; 10+ messages in thread From: Andrii Nakryiko @ 2019-10-04 14:32 UTC (permalink / raw) To: John Fastabend Cc: Andrii Nakryiko, bpf, Networking, Alexei Starovoitov, Daniel Borkmann, Kernel Team On Fri, Oct 4, 2019 at 7:05 AM John Fastabend <john.fastabend@gmail.com> wrote: > > Andrii Nakryiko wrote: > > Kernel version enforcement for kprobes/kretprobes was removed from > > 5.0 kernel in 6c4fc209fcf9 ("bpf: remove useless version check for prog load"). > > Since then, BPF programs were specifying SEC("version") just to please > > libbpf. We should stop enforcing this in libbpf, if even kernel doesn't > > care. Furthermore, libbpf now will pre-populate current kernel version > > of the host system, in case we are still running on old kernel. > > > > This patch also removes __bpf_object__open_xattr from libbpf.h, as > > nothing in libbpf is relying on having it in that header. That function > > was never exported as LIBBPF_API and even name suggests its internal > > version. So this should be safe to remove, as it doesn't break ABI. > > > > Signed-off-by: Andrii Nakryiko <andriin@fb.com> > > --- > > tools/lib/bpf/libbpf.c | 79 ++++++------------- > > tools/lib/bpf/libbpf.h | 2 - > > .../selftests/bpf/progs/test_attach_probe.c | 1 - > > .../bpf/progs/test_get_stack_rawtp.c | 1 - > > .../selftests/bpf/progs/test_perf_buffer.c | 1 - > > .../selftests/bpf/progs/test_stacktrace_map.c | 1 - > > 6 files changed, 22 insertions(+), 63 deletions(-) > > [...] > > > static struct bpf_object * > > -__bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > > - bool needs_kver, int flags) > > +__bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, > > + int flags) > > { > > struct bpf_object *obj; > > int err; > > @@ -3617,7 +3585,6 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > > CHECK_ERR(bpf_object__probe_caps(obj), err, out); > > CHECK_ERR(bpf_object__elf_collect(obj, flags), err, out); > > If we are not going to validate the section should we also skip collect'ing it? Well, if user supplied version, we will parse and use it to override out prepopulated one, so in that sense we do have validation. But I think it's fine just to drop it altogether. Will do in v3. > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index e0276520171b..22a458cd602c 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -1567,12 +1567,6 @@ static int bpf_object__elf_collect(struct bpf_object *obj, int flags) > data->d_size); > if (err) > return err; > - } else if (strcmp(name, "version") == 0) { > - err = bpf_object__init_kversion(obj, > - data->d_buf, > - data->d_size); > - if (err) > - return err; > } else if (strcmp(name, "maps") == 0) { > obj->efile.maps_shndx = idx; > } else if (strcmp(name, MAPS_ELF_SEC) == 0) { > > > > CHECK_ERR(bpf_object__collect_reloc(obj), err, out); > > - CHECK_ERR(bpf_object__validate(obj, needs_kver), err, out); > > > > bpf_object__elf_finish(obj); > > return obj; > > @@ -3626,8 +3593,8 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz, > > return ERR_PTR(err); > > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 14:32 ` Andrii Nakryiko @ 2019-10-04 14:36 ` Alexei Starovoitov 2019-10-04 14:55 ` John Fastabend 2019-10-04 15:07 ` Andrii Nakryiko 0 siblings, 2 replies; 10+ messages in thread From: Alexei Starovoitov @ 2019-10-04 14:36 UTC (permalink / raw) To: Andrii Nakryiko, John Fastabend Cc: Andrii Nakryiko, bpf, Networking, Daniel Borkmann, Kernel Team On 10/4/19 7:32 AM, Andrii Nakryiko wrote: >> If we are not going to validate the section should we also skip collect'ing it? > Well, if user supplied version, we will parse and use it to override > out prepopulated one, so in that sense we do have validation. > > But I think it's fine just to drop it altogether. Will do in v3. > what about older kernel that still enforce it? May be populate it in bpf_attr while loading, but don't check it in elf from libbpf? ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 14:36 ` Alexei Starovoitov @ 2019-10-04 14:55 ` John Fastabend 2019-10-04 15:07 ` Andrii Nakryiko 1 sibling, 0 replies; 10+ messages in thread From: John Fastabend @ 2019-10-04 14:55 UTC (permalink / raw) To: Alexei Starovoitov, Andrii Nakryiko, John Fastabend Cc: Andrii Nakryiko, bpf, Networking, Daniel Borkmann, Kernel Team Alexei Starovoitov wrote: > On 10/4/19 7:32 AM, Andrii Nakryiko wrote: > >> If we are not going to validate the section should we also skip collect'ing it? > > Well, if user supplied version, we will parse and use it to override > > out prepopulated one, so in that sense we do have validation. > > > > But I think it's fine just to drop it altogether. Will do in v3. > > > > what about older kernel that still enforce it? > May be populate it in bpf_attr while loading, but > don't check it in elf from libbpf? Yeah, guess I wasn't thinking clearly this morning. The way my BPF progs are currently written we use the version section to populate the kver. Easy enough to change though if we think its cleaner to use an attribute to set it. Actually, seems better to pass via bpf_attr IMO because currently we use defines to populate the version which is a bit ugly. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 14:36 ` Alexei Starovoitov 2019-10-04 14:55 ` John Fastabend @ 2019-10-04 15:07 ` Andrii Nakryiko 2019-10-04 15:59 ` John Fastabend 1 sibling, 1 reply; 10+ messages in thread From: Andrii Nakryiko @ 2019-10-04 15:07 UTC (permalink / raw) To: Alexei Starovoitov Cc: John Fastabend, Andrii Nakryiko, bpf, Networking, Daniel Borkmann, Kernel Team On Fri, Oct 4, 2019 at 7:36 AM Alexei Starovoitov <ast@fb.com> wrote: > > On 10/4/19 7:32 AM, Andrii Nakryiko wrote: > >> If we are not going to validate the section should we also skip collect'ing it? > > Well, if user supplied version, we will parse and use it to override > > out prepopulated one, so in that sense we do have validation. > > > > But I think it's fine just to drop it altogether. Will do in v3. > > > > what about older kernel that still enforce it? > May be populate it in bpf_attr while loading, but > don't check it in elf from libbpf? That's what my change does. I pre-populate correct kernel version in bpf_object->kern_version from uname(). If ELF has "version" section, we still parse it and override bpf_object->kern_version. bpf_object->kern_version then is always specified as part of bpf_prog_load->kern_version. So what we are discussing here is to not even look at user-provided version, but just always specify correct current kernel version. So I don't think we are going to break anything, except we might allow to pass some programs that were failing before due to unspecified or zero version. So with that, do you think it's ok to get rid of version section altogether? ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 15:07 ` Andrii Nakryiko @ 2019-10-04 15:59 ` John Fastabend 2019-10-18 14:49 ` John Fastabend 0 siblings, 1 reply; 10+ messages in thread From: John Fastabend @ 2019-10-04 15:59 UTC (permalink / raw) To: Andrii Nakryiko, Alexei Starovoitov Cc: John Fastabend, Andrii Nakryiko, bpf, Networking, Daniel Borkmann, Kernel Team Andrii Nakryiko wrote: > On Fri, Oct 4, 2019 at 7:36 AM Alexei Starovoitov <ast@fb.com> wrote: > > > > On 10/4/19 7:32 AM, Andrii Nakryiko wrote: > > >> If we are not going to validate the section should we also skip collect'ing it? > > > Well, if user supplied version, we will parse and use it to override > > > out prepopulated one, so in that sense we do have validation. > > > > > > But I think it's fine just to drop it altogether. Will do in v3. > > > > > > > what about older kernel that still enforce it? > > May be populate it in bpf_attr while loading, but > > don't check it in elf from libbpf? > > That's what my change does. I pre-populate correct kernel version in > bpf_object->kern_version from uname(). If ELF has "version" section, > we still parse it and override bpf_object->kern_version. > bpf_object->kern_version then is always specified as part of > bpf_prog_load->kern_version. > > So what we are discussing here is to not even look at user-provided > version, but just always specify correct current kernel version. So I > don't think we are going to break anything, except we might allow to > pass some programs that were failing before due to unspecified or zero > version. > > So with that, do you think it's ok to get rid of version section altogether? Should be fine on my side. Go for it. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users 2019-10-04 15:59 ` John Fastabend @ 2019-10-18 14:49 ` John Fastabend 0 siblings, 0 replies; 10+ messages in thread From: John Fastabend @ 2019-10-18 14:49 UTC (permalink / raw) To: John Fastabend, Andrii Nakryiko, Alexei Starovoitov Cc: John Fastabend, Andrii Nakryiko, bpf, Networking, Daniel Borkmann, Kernel Team John Fastabend wrote: > Andrii Nakryiko wrote: > > On Fri, Oct 4, 2019 at 7:36 AM Alexei Starovoitov <ast@fb.com> wrote: > > > > > > On 10/4/19 7:32 AM, Andrii Nakryiko wrote: > > > >> If we are not going to validate the section should we also skip collect'ing it? > > > > Well, if user supplied version, we will parse and use it to override > > > > out prepopulated one, so in that sense we do have validation. > > > > > > > > But I think it's fine just to drop it altogether. Will do in v3. > > > > > > > > > > what about older kernel that still enforce it? > > > May be populate it in bpf_attr while loading, but > > > don't check it in elf from libbpf? > > > > That's what my change does. I pre-populate correct kernel version in > > bpf_object->kern_version from uname(). If ELF has "version" section, > > we still parse it and override bpf_object->kern_version. > > bpf_object->kern_version then is always specified as part of > > bpf_prog_load->kern_version. > > > > So what we are discussing here is to not even look at user-provided > > version, but just always specify correct current kernel version. So I > > don't think we are going to break anything, except we might allow to > > pass some programs that were failing before due to unspecified or zero > > version. > > > > So with that, do you think it's ok to get rid of version section altogether? > > Should be fine on my side. Go for it. ... Actually it turns out this broke some kernels that report via uname() incorrect version info. Sent a patch out to add just the bits back we need to get it working again. To bad but I can't fix distributions that are deployed so... ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH bpf-next 2/2] libbpf: add bpf_object__open_{file,mem} w/ extensible opts 2019-10-04 3:00 [PATCH bpf-next 0/2] Add new-style bpf_object__open APIs Andrii Nakryiko 2019-10-04 3:00 ` [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users Andrii Nakryiko @ 2019-10-04 3:00 ` Andrii Nakryiko 1 sibling, 0 replies; 10+ messages in thread From: Andrii Nakryiko @ 2019-10-04 3:00 UTC (permalink / raw) To: bpf, netdev, ast, daniel; +Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko Add new set of bpf_object__open APIs using new approach to optional parameters extensibility allowing simpler ABI compatibility approach. This patch demonstrates an approach to implementing libbpf APIs that makes it easy to extend existing APIs with extra optional parameters in such a way, that ABI compatibility is preserved without having to do symbol versioning and generating lots of boilerplate code to handle it. To facilitate succinct code for working with options, add OPTS_VALID, OPTS_HAS, and OPTS_GET macros that hide all the NULL, size, and zero checks. Additionally, newly added libbpf APIs are encouraged to follow similar pattern of having all mandatory parameters as formal function parameters and always have optional (NULL-able) xxx_opts struct, which should always have real struct size as a first field and the rest would be optional parameters added over time, which tune the behavior of existing API, if specified by user. Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- tools/lib/bpf/libbpf.c | 51 ++++++++++++++++++++++++++++----- tools/lib/bpf/libbpf.h | 35 ++++++++++++++++++++-- tools/lib/bpf/libbpf.map | 3 ++ tools/lib/bpf/libbpf_internal.h | 31 ++++++++++++++++++++ 4 files changed, 110 insertions(+), 10 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 056769ce4fd0..b7e2cedb3461 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3620,16 +3620,33 @@ struct bpf_object *bpf_object__open(const char *path) return bpf_object__open_xattr(&attr); } -struct bpf_object *bpf_object__open_buffer(void *obj_buf, - size_t obj_buf_sz, - const char *name) +struct bpf_object * +bpf_object__open_file(const char *path, struct bpf_object_open_opts *opts) +{ + if (!OPTS_VALID(opts, bpf_object_open_opts, relaxed_maps)) + return ERR_PTR(-EINVAL); + if (!path) + return ERR_PTR(-EINVAL); + + pr_debug("loading %s\n", path); + + return __bpf_object__open(path, NULL, 0, 0); +} + +struct bpf_object * +bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz, + struct bpf_object_open_opts *opts) { char tmp_name[64]; + const char *name; + bool relaxed_maps; - /* param validation */ - if (!obj_buf || obj_buf_sz <= 0) - return NULL; + if (!OPTS_VALID(opts, bpf_object_open_opts, relaxed_maps)) + return ERR_PTR(-EINVAL); + if (!obj_buf || obj_buf_sz == 0) + return ERR_PTR(-EINVAL); + name = OPTS_GET(opts, object_name, NULL); if (!name) { snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx", (unsigned long)obj_buf, @@ -3638,7 +3655,27 @@ struct bpf_object *bpf_object__open_buffer(void *obj_buf, } pr_debug("loading object '%s' from buffer\n", name); - return __bpf_object__open(name, obj_buf, obj_buf_sz, true); + relaxed_maps = OPTS_GET(opts, relaxed_maps, false); + + return __bpf_object__open(name, obj_buf, obj_buf_sz, + relaxed_maps ? MAPS_RELAX_COMPAT : 0); +} + +struct bpf_object * +bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz, + const char *name) +{ + LIBBPF_OPTS(bpf_object_open_opts, opts, + .object_name = name, + /* wrong default, but backwards-compatible */ + .relaxed_maps = true, + ); + + /* returning NULL is wrong, but backwards-compatible */ + if (!obj_buf || obj_buf_sz == 0) + return NULL; + + return bpf_object__open_mem(obj_buf, obj_buf_sz, &opts); } int bpf_object__unload(struct bpf_object *obj) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 2905dffd70b2..62a19167e245 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -67,12 +67,41 @@ struct bpf_object_open_attr { enum bpf_prog_type prog_type; }; +/* Helper macro to declare and initialize libbpf options struct */ +#define LIBBPF_OPTS(TYPE, NAME, ...) \ + struct TYPE NAME = { \ + .sz = sizeof(struct TYPE), \ + __VA_ARGS__ \ + } + +struct bpf_object_open_opts { + /* size of this struct, for forward/backward compatiblity */ + size_t sz; + /* object name override, if provided: + * - for object open from file, this will override setting object + * name from file path's base name; + * - for object open from memory buffer, this will specify an object + * name and will override default "<addr>-<buf-size>" name; + */ + const char *object_name; + /* parse map definitions non-strictly, allowing extra attributes/data */ + bool relaxed_maps; +}; + LIBBPF_API struct bpf_object *bpf_object__open(const char *path); LIBBPF_API struct bpf_object * +bpf_object__open_file(const char *path, struct bpf_object_open_opts *opts); +LIBBPF_API struct bpf_object * +bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz, + struct bpf_object_open_opts *opts); + +/* deprecated bpf_object__open variants */ +LIBBPF_API struct bpf_object * +bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz, + const char *name); +LIBBPF_API struct bpf_object * bpf_object__open_xattr(struct bpf_object_open_attr *attr); -LIBBPF_API struct bpf_object *bpf_object__open_buffer(void *obj_buf, - size_t obj_buf_sz, - const char *name); + int bpf_object__section_size(const struct bpf_object *obj, const char *name, __u32 *size); int bpf_object__variable_offset(const struct bpf_object *obj, const char *name, diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 8d10ca03d78d..4d241fd92dd4 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -192,4 +192,7 @@ LIBBPF_0.0.5 { } LIBBPF_0.0.4; LIBBPF_0.0.6 { + global: + bpf_object__open_file; + bpf_object__open_mem; } LIBBPF_0.0.5; diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index 2e83a34f8c79..0bbb4653684c 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -47,6 +47,37 @@ do { \ #define pr_info(fmt, ...) __pr(LIBBPF_INFO, fmt, ##__VA_ARGS__) #define pr_debug(fmt, ...) __pr(LIBBPF_DEBUG, fmt, ##__VA_ARGS__) +static inline bool libbpf_validate_opts(const char *opts, + size_t opts_sz, size_t user_sz, + const char *type_name) +{ + if (user_sz < sizeof(size_t)) { + pr_warning("%s size (%zu) is too small\n", type_name, user_sz); + return false; + } + if (user_sz > opts_sz) { + size_t i; + + for (i = opts_sz; i < user_sz; i++) { + if (opts[i]) { + pr_warning("%s has non-zero extra bytes", + type_name); + return false; + } + } + } + return true; +} + +#define OPTS_VALID(opts, type, last_field) \ + (!(opts) || libbpf_validate_opts((const char *)opts, \ + offsetof(struct type, last_field), \ + (opts)->sz, #type)) +#define OPTS_HAS(opts, field) \ + ((opts) && opts->sz >= offsetofend(typeof(*(opts)), field)) +#define OPTS_GET(opts, field, fallback_value) \ + (OPTS_HAS(opts, field) ? (opts)->field : fallback_value) + int libbpf__load_raw_btf(const char *raw_types, size_t types_len, const char *str_sec, size_t str_len); -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-10-18 14:49 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-04 3:00 [PATCH bpf-next 0/2] Add new-style bpf_object__open APIs Andrii Nakryiko
2019-10-04 3:00 ` [PATCH bpf-next 1/2] libbpf: stop enforcing kern_version, populate it for users Andrii Nakryiko
2019-10-04 14:05 ` John Fastabend
2019-10-04 14:32 ` Andrii Nakryiko
2019-10-04 14:36 ` Alexei Starovoitov
2019-10-04 14:55 ` John Fastabend
2019-10-04 15:07 ` Andrii Nakryiko
2019-10-04 15:59 ` John Fastabend
2019-10-18 14:49 ` John Fastabend
2019-10-04 3:00 ` [PATCH bpf-next 2/2] libbpf: add bpf_object__open_{file,mem} w/ extensible opts Andrii Nakryiko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).