libbpf: remove deprecated APIs
Subsystems (6)
Andrii Nakryiko
maintainerv2 cover libbpf: remove deprecated APIs
This patch set removes all the deprecated APIs in preparation for 1.0 release. It also makes libbpf_set_strict_mode() a no-op (but keeps it to let per-1.0 applications buildable and dynamically linkable against libbpf 1.0 if they were already libbpf-1.0 ready) and starts enforcing all the behaviors that were previously opt-in through libbpf_set_strict_mode().
xsk.{c,h} parts that are now properly provided by libxdp ([0]) are still used by xdpxceiver.c in selftest/bpf, so I've moved xsk.{c,h} with barely any changes to under selftests/bpf.
Other than that, apart from removing all the LIBBPF_DEPRECATED-marked APIs, there is a bunch of internal clean ups allowed by that. I've also "restored" libbpf.map inheritance chain while removing all the deprecated APIs. I think that's the right way to do this, as applications using libbpf as shared library but not relying on any deprecated APIs (i.e., "good citizens" that prepared for libbpf 1.0 release ahead of time to minimize disruption) should be able to link both against 0.x and 1.x versions. Either way, it doesn't seem to break anything and preserve a history on when each "surviving" API was added.
[0] https://github.com/xdp-project/xdp-tools/tree/master/lib/libxdp
v1->v2:
- rebase on latest bpf-next now that Jiri's perf patches landed;
- fix xsk.o dependency in Makefile to ensure libbpf headers are installed reliably.
Andrii Nakryiko (15):
libbpf: move xsk.{c,h} into selftests/bpf
libbpf: remove deprecated low-level APIs
libbpf: remove deprecated XDP APIs
libbpf: remove deprecated probing APIs
libbpf: remove deprecated BTF APIs
libbpf: clean up perfbuf APIs
libbpf: remove prog_info_linear APIs
libbpf: remove most other deprecated high-level APIs
libbpf: remove multi-instance and custom private data APIs
libbpf: cleanup LIBBPF_DEPRECATED_SINCE supporting macros for v0.x
libbpf: remove internal multi-instance prog support
libbpf: clean up SEC() handling
selftests/bpf: remove last tests with legacy BPF map definitions
libbpf: enforce strict libbpf 1.0 behaviors
libbpf: fix up few libbpf.map problems
tools/lib/bpf/Build | 2 +-
tools/lib/bpf/Makefile | 2 +-
tools/lib/bpf/bpf.c | 178 +-
tools/lib/bpf/bpf.h | 83 -
tools/lib/bpf/btf.c | 183 +--
tools/lib/bpf/btf.h | 86 +-
tools/lib/bpf/btf_dump.c | 23 +-
tools/lib/bpf/libbpf.c | 1429 ++---------------
tools/lib/bpf/libbpf.h | 469 +-----
tools/lib/bpf/libbpf.map | 113 +-
tools/lib/bpf/libbpf_common.h | 16 +-
tools/lib/bpf/libbpf_internal.h | 24 +-
tools/lib/bpf/libbpf_legacy.h | 28 +-
tools/lib/bpf/libbpf_probes.c | 125 +-
tools/lib/bpf/netlink.c | 62 +-
tools/testing/selftests/bpf/Makefile | 2 +
tools/testing/selftests/bpf/bpf_legacy.h | 9 -
tools/testing/selftests/bpf/prog_tests/btf.c | 1 -
.../selftests/bpf/progs/test_btf_haskv.c | 51 -
.../selftests/bpf/progs/test_btf_newkv.c | 18 -
tools/testing/selftests/bpf/xdpxceiver.c | 2 +-
tools/{lib => testing/selftests}/bpf/xsk.c | 76 +-
tools/{lib => testing/selftests}/bpf/xsk.h | 29 +-
23 files changed, 261 insertions(+), 2750 deletions(-)
delete mode 100644 tools/testing/selftests/bpf/progs/test_btf_haskv.c
rename tools/{lib => testing/selftests}/bpf/xsk.c (95%)
rename tools/{lib => testing/selftests}/bpf/xsk.h (84%)Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 1/15 libbpf: move xsk.{c,h} into selftests/bpf
Remove deprecated xsk APIs from libbpf. But given we have selftests relying on this, move those files (with minimal adjustments to make them compilable) under selftests/bpf.
We also remove all the removed APIs from libbpf.map, while overall keeping version inheritance chain, as most APIs are backwards compatible so there is no need to reassign them as LIBBPF_1.0.0 versions.
---
tools/lib/bpf/Build | 2 +-
tools/lib/bpf/Makefile | 2 +-
tools/lib/bpf/libbpf.map | 12 ----
tools/testing/selftests/bpf/Makefile | 2 +
tools/testing/selftests/bpf/xdpxceiver.c | 2 +-
tools/{lib => testing/selftests}/bpf/xsk.c | 76 ++++++++++++----------
tools/{lib => testing/selftests}/bpf/xsk.h | 29 ++-------
7 files changed, 49 insertions(+), 76 deletions(-)
rename tools/{lib => testing/selftests}/bpf/xsk.c (95%)
rename tools/{lib => testing/selftests}/bpf/xsk.h (84%)tools/lib/bpf/Build +1 -1
@@ -1,4 +1,4 @@ libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_errno.o str_error.o \ - netlink.o bpf_prog_linfo.o libbpf_probes.o xsk.o hashmap.o \ + netlink.o bpf_prog_linfo.o libbpf_probes.o hashmap.o \ btf_dump.o ringbuf.o strset.o linker.o gen_loader.o relo_core.o \ usdt.o
tools/lib/bpf/Makefile +1 -1
@@ -237,7 +237,7 @@ install_lib: all_cmd $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ) -SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ +SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h \ bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ skel_internal.h libbpf_version.h usdt.bpf.h GEN_HDRS := $(BPF_GENERATED)
tools/lib/bpf/libbpf.map +0 -12
@@ -147,12 +147,6 @@ LIBBPF_0.0.2 { btf_ext__new; btf_ext__reloc_func_info; btf_ext__reloc_line_info; - xsk_umem__create; - xsk_socket__create; - xsk_umem__delete; - xsk_socket__delete; - xsk_umem__fd; - xsk_socket__fd; bpf_program__get_prog_info_linear; bpf_program__bpil_addr_to_offs; bpf_program__bpil_offs_to_addr;
@@ -183,7 +177,6 @@ LIBBPF_0.0.4 { perf_buffer__new; perf_buffer__new_raw; perf_buffer__poll; - xsk_umem__create; } LIBBPF_0.0.3; LIBBPF_0.0.5 {
@@ -336,7 +329,6 @@ LIBBPF_0.2.0 { perf_buffer__buffer_fd; perf_buffer__epoll_fd; perf_buffer__consume_buffer; - xsk_socket__create_shared; } LIBBPF_0.1.0; LIBBPF_0.3.0 {
@@ -348,8 +340,6 @@ LIBBPF_0.3.0 { btf__new_empty_split; btf__new_split; ring_buffer__epoll_fd; - xsk_setup_xdp_prog; - xsk_socket__update_xskmap; } LIBBPF_0.2.0; LIBBPF_0.4.0 {
@@ -468,6 +458,4 @@ LIBBPF_1.0.0 { libbpf_bpf_link_type_str; libbpf_bpf_map_type_str; libbpf_bpf_prog_type_str; - - local: *; };
tools/testing/selftests/bpf/Makefile +2 -0
@@ -230,6 +230,8 @@ $(OUTPUT)/xdping: $(TESTING_HELPERS) $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) $(OUTPUT)/test_maps: $(TESTING_HELPERS) $(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) +$(OUTPUT)/xsk.o: $(BPFOBJ) +$(OUTPUT)/xdpxceiver: $(OUTPUT)/xsk.o BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
tools/testing/selftests/bpf/xdpxceiver.c +1 -1
@@ -97,7 +97,7 @@#include <time.h> #include <unistd.h> #include <stdatomic.h> -#include <bpf/xsk.h> +#include "xsk.h" #include "xdpxceiver.h" #include "../kselftest.h"
tools/testing/selftests/bpf/xsk.c renamed from tools/lib/bpf/xsk.c +40 -36
147 lines not on this page · raw message
tools/testing/selftests/bpf/xsk.h renamed from tools/lib/bpf/xsk.h +4 -25
@@ -9,15 +9,15 @@* Author(s): Magnus Karlsson <[email protected]> */ -#ifndef __LIBBPF_XSK_H -#define __LIBBPF_XSK_H +#ifndef __XSK_H +#define __XSK_H #include <stdio.h> #include <stdint.h> #include <stdbool.h> #include <linux/if_xdp.h> -#include "libbpf.h" +#include <bpf/libbpf.h> #ifdef __cplusplus extern "C" {
@@ -251,9 +251,7 @@ static inline __u64 xsk_umem__add_offset_to_addr(__u64 addr)return xsk_umem__extract_addr (addr) +xsk_umem__extract_offset (addr); } -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__fd (const struct xsk_umem *umem); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__fd (const struct xsk_socket *xsk);#define XSK_RING_CONS__DEFAULT_NUM_DESCS 2048
@@ -271,9 +269,7 @@ struct xsk_umem_config {__u32 flags; }; -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_setup_xdp_prog (int ifindex,int *xsks_map_fd); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__update_xskmap (struct xsk_socket *xsk,int xsks_map_fd);/* Flags for the libbpf_flags field. */
@@ -288,32 +284,17 @@ struct xsk_socket_config { };/* Set config to NULL to get the default configuration. */ -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__create (struct xsk_umem **umem,void *umem_area,__u64 size,struct xsk_ring_prod *fill,struct xsk_ring_cons *comp,const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") -int xsk_umem__create_v0_0_2 (struct xsk_umem **umem, -void *umem_area,__u64 size, -struct xsk_ring_prod *fill, -struct xsk_ring_cons *comp, -const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") -int xsk_umem__create_v0_0_4 (struct xsk_umem **umem, -void *umem_area,__u64 size, -struct xsk_ring_prod *fill, -struct xsk_ring_cons *comp, -const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__create (struct xsk_socket **xsk,const char *ifname,__u32 queue_id,struct xsk_umem *umem,struct xsk_ring_cons *rx,struct xsk_ring_prod *tx,const struct xsk_socket_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, const char *ifname, __u32 queue_id, struct xsk_umem *umem,
@@ -324,13 +305,11 @@ int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, const struct xsk_socket_config *config);/* Returns 0 for success and -EBUSY if the umem is still in use. */ -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__delete (struct xsk_umem *umem); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")void xsk_socket__delete (struct xsk_socket *xsk);#ifdef __cplusplus } /* extern "C" */#endif -#endif /* __LIBBPF_XSK_H */ +#endif /* __XSK_H */
Signature · 1 line
2.30.2
Maciej Fijalkowski
maintainerRe: [PATCH v2 bpf-next 01/15] libbpf: move xsk.{c,h} into selftests/bpf
Quoted 7 lines · Andrii Nakryiko
Remove deprecated xsk APIs from libbpf. But given we have selftests relying on this, move those files (with minimal adjustments to make them compilable) under selftests/bpf.
We also remove all the removed APIs from libbpf.map, while overall keeping version inheritance chain, as most APIs are backwards compatible so there is no need to reassign them as LIBBPF_1.0.0 versions.
Hey Andrii,
First of all, great that you are moving this over to selftests where we can use this as the base for our upcoming control path tests. However, during some of our selftests work we have found a bug in the xsk part of libbpf that you're moving here. What is the way forward to fixing this from your perspective? Should we wait once this set lands so that we would fix this in the xsk.c file in selftests/bpf? Or would you pick the bugfix before doing the move?
Also, what is the timeline for landing libbpf 1.0?
Quoted 375 lines
Cc Magnus Karlsson <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>--- tools/lib/bpf/Build | 2 +- tools/lib/bpf/Makefile | 2 +- tools/lib/bpf/libbpf.map | 12 ---- tools/testing/selftests/bpf/Makefile | 2 + tools/testing/selftests/bpf/xdpxceiver.c | 2 +- tools/{lib => testing/selftests}/bpf/xsk.c | 76 ++++++++++++---------- tools/{lib => testing/selftests}/bpf/xsk.h | 29 ++------- 7 files changed, 49 insertions(+), 76 deletions(-) rename tools/{lib => testing/selftests}/bpf/xsk.c (95%) rename tools/{lib => testing/selftests}/bpf/xsk.h (84%)tools/lib/bpf/Build +1
-1@@ -1,4 +1,4 @@ libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_errno.o str_error.o \ - netlink.o bpf_prog_linfo.o libbpf_probes.o xsk.o hashmap.o \ + netlink.o bpf_prog_linfo.o libbpf_probes.o hashmap.o \ btf_dump.o ringbuf.o strset.o linker.o gen_loader.o relo_core.o \ usdt.otools/lib/bpf/Makefile +1
-1@@ -237,7 +237,7 @@ install_lib: all_cmd $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ) -SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ +SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h \ bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ skel_internal.h libbpf_version.h usdt.bpf.h GEN_HDRS := $(BPF_GENERATED)tools/lib/bpf/libbpf.map +0
-12@@ -147,12 +147,6 @@ LIBBPF_0.0.2 { btf_ext__new; btf_ext__reloc_func_info; btf_ext__reloc_line_info; - xsk_umem__create; - xsk_socket__create; - xsk_umem__delete; - xsk_socket__delete; - xsk_umem__fd; - xsk_socket__fd; bpf_program__get_prog_info_linear; bpf_program__bpil_addr_to_offs; bpf_program__bpil_offs_to_addr;@@ -183,7 +177,6 @@ LIBBPF_0.0.4 { perf_buffer__new; perf_buffer__new_raw; perf_buffer__poll; - xsk_umem__create; } LIBBPF_0.0.3; LIBBPF_0.0.5 {@@ -336,7 +329,6 @@ LIBBPF_0.2.0 { perf_buffer__buffer_fd; perf_buffer__epoll_fd; perf_buffer__consume_buffer; - xsk_socket__create_shared; } LIBBPF_0.1.0; LIBBPF_0.3.0 {@@ -348,8 +340,6 @@ LIBBPF_0.3.0 { btf__new_empty_split; btf__new_split; ring_buffer__epoll_fd; - xsk_setup_xdp_prog; - xsk_socket__update_xskmap; } LIBBPF_0.2.0; LIBBPF_0.4.0 {@@ -468,6 +458,4 @@ LIBBPF_1.0.0 { libbpf_bpf_link_type_str; libbpf_bpf_map_type_str; libbpf_bpf_prog_type_str; - - local: *; };tools/testing/selftests/bpf/Makefile +2
-0@@ -230,6 +230,8 @@ $(OUTPUT)/xdping: $(TESTING_HELPERS) $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) $(OUTPUT)/test_maps: $(TESTING_HELPERS) $(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) +$(OUTPUT)/xsk.o: $(BPFOBJ) +$(OUTPUT)/xdpxceiver: $(OUTPUT)/xsk.o BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \tools/testing/selftests/bpf/xdpxceiver.c +1
-1@@ -97,7 +97,7 @@#include <time.h> #include <unistd.h> #include <stdatomic.h> -#include <bpf/xsk.h> +#include "xsk.h" #include "xdpxceiver.h" #include "../kselftest.h" tools/testing/selftests/bpf/xsk.c renamed from tools/lib/bpf/xsk.c +40
-36@@ -30,16 +30,10 @@#include <sys/types.h> #include <linux/if_link.h> -#include "bpf.h" -#include "libbpf.h" -#include "libbpf_internal.h" +#include <bpf/bpf.h> +#include <bpf/libbpf.h> #include "xsk.h" -/* entire xsk.h and xsk.c is going away in libbpf 1.0, so ignore all internal -* uses of deprecated APIs -*/ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#ifndef SOL_XDP #define SOL_XDP 283#endif @@ -52,6 +46,8 @@#define PF_XDP AF_XDP#endif +#define pr_warn (fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) +enum xsk_prog {XSK_PROG_FALLBACK ,XSK_PROG_REDIRECT_FLAGS ,@@ -286,11 +282,10 @@ static int xsk_create_umem_rings(struct xsk_umem *umem, int fd,return err; } -DEFAULT_VERSION(xsk_umem__create_v0_0_4, xsk_umem__create, LIBBPF_0.0.4) -int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area, - __u64 size, struct xsk_ring_prod *fill, - struct xsk_ring_cons *comp, - const struct xsk_umem_config *usr_config) +int xsk_umem__create (struct xsk_umem **umem_ptr,void *umem_area, +__u64 size,struct xsk_ring_prod *fill, +struct xsk_ring_cons *comp, +const struct xsk_umem_config *usr_config) {struct xdp_umem_reg mr;struct xsk_umem *umem;@@ -351,25 +346,9 @@ struct xsk_umem_config_v1 {__u32 frame_headroom; }; -COMPAT_VERSION(xsk_umem__create_v0_0_2, xsk_umem__create, LIBBPF_0.0.2) -int xsk_umem__create_v0_0_2(struct xsk_umem **umem_ptr, void *umem_area, - __u64 size, struct xsk_ring_prod *fill, - struct xsk_ring_cons *comp, - const struct xsk_umem_config *usr_config) -{ -struct xsk_umem_config config; - -memcpy (&config, usr_config,sizeof (struct xsk_umem_config_v1 )); - config.flags =0 ; - -return xsk_umem__create_v0_0_4 (umem_ptr, umem_area, size, fill, comp, - &config); -} -static enum xsk_prog get_xsk_prog (void ) {enum xsk_prog detected =XSK_PROG_FALLBACK ; -__u32 size_out, retval, duration;char data_in =0 , data_out;struct bpf_insn insns[] = {BPF_LD_MAP_FD (BPF_REG_1 ,0 ),@@ -378,6 +357,12 @@ static enum xsk_prog get_xsk_prog(void)BPF_EMIT_CALL (BPF_FUNC_redirect_map),BPF_EXIT_INSN (), }; +LIBBPF_OPTS (bpf_test_run_opts, opts, + .data_in = &data_in, + .data_size_in = 1, + .data_out = &data_out, + ); +int prog_fd, map_fd, ret, insn_cnt =ARRAY_SIZE (insns); map_fd =bpf_map_create (BPF_MAP_TYPE_XSKMAP ,NULL ,sizeof (int ),sizeof (int ),1 ,NULL );@@ -392,8 +377,8 @@ static enum xsk_prog get_xsk_prog(void)return detected; } - ret =bpf_prog_test_run (prog_fd,0 , &data_in,1 , &data_out, &size_out, &retval, &duration); -if (!ret && retval ==XDP_PASS ) + ret =bpf_prog_test_run_opts (prog_fd, &opts); +if (!ret && opts.retval ==XDP_PASS ) detected =XSK_PROG_REDIRECT_FLAGS ;close (prog_fd);close (map_fd);@@ -510,7 +495,7 @@ static int xsk_create_bpf_link(struct xsk_socket *xsk)int link_fd;int err; - err =bpf_get_link_xdp_id (ctx->ifindex, &prog_id, xsk->config.xdp_flags); + err =bpf_xdp_query_id (ctx->ifindex, xsk->config.xdp_flags, &prog_id);if (err) {pr_warn ("getting XDP prog id failed\n" );return err;@@ -536,6 +521,25 @@ static int xsk_create_bpf_link(struct xsk_socket *xsk)return 0 ; } +/* Copy up to sz - 1 bytes from zero-terminated src string and ensure that dst +* is zero-terminated string no matter what (unless sz == 0, in which case +* it's a no-op). It's conceptually close to FreeBSD's strlcpy(), but differs +* in what is returned. Given this is internal helper, it's trivial to extend +* this, when necessary. Use this instead of strncpy inside libbpf source code. +*/ +static inline void libbpf_strlcpy (char *dst,const char *src,size_t sz) +{ +size_t i; + +if (sz ==0 ) +return ; + + sz--; +for (i =0 ; i < sz && src[i]; i++) + dst[i] = src[i]; + dst[i] ='\0' ; +} +static int xsk_get_max_queues (struct xsk_socket *xsk) {struct ethtool_channels channels = { .cmd =ETHTOOL_GCHANNELS };@@ -792,8 +796,8 @@ static int xsk_init_xdp_res(struct xsk_socket *xsk,if (ctx->has_bpf_link) err =xsk_create_bpf_link (xsk);else - err =bpf_set_link_xdp_fd (xsk->ctx->ifindex, ctx->prog_fd, - xsk->config.xdp_flags); + err =bpf_xdp_attach (xsk->ctx->ifindex, ctx->prog_fd, + xsk->config.xdp_flags,NULL );if (err) goto err_attach_xdp_prog;@@ -811,7 +815,7 @@ static int xsk_init_xdp_res(struct xsk_socket *xsk,if (ctx->has_bpf_link)close (ctx->link_fd);else -bpf_set_link_xdp_fd (ctx->ifindex,-1 ,0 ); +bpf_xdp_detach (ctx->ifindex,0 ,NULL ); err_attach_xdp_prog:close (ctx->prog_fd); err_load_xdp_prog:@@ -862,7 +866,7 @@ static int __xsk_setup_xdp_prog(struct xsk_socket *_xdp, int *xsks_map_fd)if (ctx->has_bpf_link) err =xsk_link_lookup (ctx->ifindex, &prog_id, &ctx->link_fd);else - err =bpf_get_link_xdp_id (ctx->ifindex, &prog_id, xsk->config.xdp_flags); + err =bpf_xdp_query_id (ctx->ifindex, xsk->config.xdp_flags, &prog_id);if (err)return err;tools/testing/selftests/bpf/xsk.h renamed from tools/lib/bpf/xsk.h +4
-25@@ -9,15 +9,15 @@* Author(s): Magnus Karlsson <[email protected]> */ -#ifndef __LIBBPF_XSK_H -#define __LIBBPF_XSK_H +#ifndef __XSK_H +#define __XSK_H #include <stdio.h> #include <stdint.h> #include <stdbool.h> #include <linux/if_xdp.h> -#include "libbpf.h" +#include <bpf/libbpf.h> #ifdef __cplusplus extern "C" {@@ -251,9 +251,7 @@ static inline __u64 xsk_umem__add_offset_to_addr(__u64 addr)return xsk_umem__extract_addr (addr) +xsk_umem__extract_offset (addr); } -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__fd (const struct xsk_umem *umem); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__fd (const struct xsk_socket *xsk);#define XSK_RING_CONS__DEFAULT_NUM_DESCS 2048@@ -271,9 +269,7 @@ struct xsk_umem_config {__u32 flags; }; -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_setup_xdp_prog (int ifindex,int *xsks_map_fd); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__update_xskmap (struct xsk_socket *xsk,int xsks_map_fd);/* Flags for the libbpf_flags field. */ @@ -288,32 +284,17 @@ struct xsk_socket_config { };/* Set config to NULL to get the default configuration. */ -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__create (struct xsk_umem **umem,void *umem_area,__u64 size,struct xsk_ring_prod *fill,struct xsk_ring_cons *comp,const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") -int xsk_umem__create_v0_0_2 (struct xsk_umem **umem, -void *umem_area,__u64 size, -struct xsk_ring_prod *fill, -struct xsk_ring_cons *comp, -const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") -int xsk_umem__create_v0_0_4 (struct xsk_umem **umem, -void *umem_area,__u64 size, -struct xsk_ring_prod *fill, -struct xsk_ring_cons *comp, -const struct xsk_umem_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_socket__create (struct xsk_socket **xsk,const char *ifname,__u32 queue_id,struct xsk_umem *umem,struct xsk_ring_cons *rx,struct xsk_ring_prod *tx,const struct xsk_socket_config *config); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp") int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, const char *ifname, __u32 queue_id, struct xsk_umem *umem,@@ -324,13 +305,11 @@ int xsk_socket__create_shared(struct xsk_socket **xsk_ptr, const struct xsk_socket_config *config);/* Returns 0 for success and -EBUSY if the umem is still in use. */ -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")int xsk_umem__delete (struct xsk_umem *umem); -LIBBPF_API LIBBPF_DEPRECATED_SINCE(0, 7, "AF_XDP support deprecated and moved to libxdp")void xsk_socket__delete (struct xsk_socket *xsk);#ifdef __cplusplus } /* extern "C" */#endif -#endif /* __LIBBPF_XSK_H */ +#endif /* __XSK_H */ Signature · 1 line
2.30.2
Daniel Borkmann
maintainerRe: [PATCH v2 bpf-next 01/15] libbpf: move xsk.{c,h} into selftests/bpf
Hey Maciej,
Quoted 11 lines · Maciej Fijalkowski
Quoted 7 lines · Andrii Nakryiko
Remove deprecated xsk APIs from libbpf. But given we have selftests relying on this, move those files (with minimal adjustments to make them compilable) under selftests/bpf.
We also remove all the removed APIs from libbpf.map, while overall keeping version inheritance chain, as most APIs are backwards compatible so there is no need to reassign them as LIBBPF_1.0.0 versions.
Hey Andrii,
Quoted 7 lines
First of all, great that you are moving this over to selftests where we can use this as the base for our upcoming control path tests. However, during some of our selftests work we have found a bug in the xsk part of libbpf that you're moving here. What is the way forward to fixing this from your perspective? Should we wait once this set lands so that we would fix this in the
xsk.cfile in selftests/bpf? Or would you pick the bugfix before doing the move?
Just to answer this question, fwiw, the set has been applied yesterday to bpf-next tree [0], so from an upstream PoV, please send a relative fix for xsk.c file in selftests/bpf/.
Thanks,
Daniel
Maciej Fijalkowski
maintainerRe: [PATCH v2 bpf-next 01/15] libbpf: move xsk.{c,h} into selftests/bpf
Quoted 22 lines · Daniel Borkmann
Hey Maciej,
Quoted 11 lines · Maciej Fijalkowski
Quoted 7 lines · Andrii Nakryiko
Remove deprecated xsk APIs from libbpf. But given we have selftests relying on this, move those files (with minimal adjustments to make them compilable) under selftests/bpf.
We also remove all the removed APIs from libbpf.map, while overall keeping version inheritance chain, as most APIs are backwards compatible so there is no need to reassign them as LIBBPF_1.0.0 versions.
Hey Andrii,
Quoted 7 lines
First of all, great that you are moving this over to selftests where we can use this as the base for our upcoming control path tests. However, during some of our selftests work we have found a bug in the xsk part of libbpf that you're moving here. What is the way forward to fixing this from your perspective? Should we wait once this set lands so that we would fix this in the
xsk.cfile in selftests/bpf? Or would you pick the bugfix before doing the move?
Quoted 3 lines
Just to answer this question, fwiw, the set has been applied yesterday to bpf-next tree [0], so from an upstream PoV, please send a relative fix for
xsk.cfile in selftests/bpf/.
Hey Daniel,
oops missed that somehow. Thanks for fast response!
Quoted 5 lines
Thanks,
Daniel
Andrii Nakryiko
maintainerPATCH v2 2/15 libbpf: remove deprecated low-level APIs
In reply to Andrii NakryikoDrop low-level APIs as well as high-level (and very confusingly named) BPF object loading bpf_prog_load_xattr() and bpf_prog_load_deprecated() APIs.
--- tools/lib/bpf/bpf.c | 174 +-------------------------------------- tools/lib/bpf/bpf.h | 83 ------------------- tools/lib/bpf/libbpf.c | 89 -------------------- tools/lib/bpf/libbpf.h | 16 ---- tools/lib/bpf/libbpf.map | 16 ---- 5 files changed, 4 insertions(+), 374 deletions(-)
tools/lib/bpf/bpf.c +4 -170
@@ -233,11 +233,10 @@ alloc_zero_tailing_info(const void *orecord, __u32 cnt,return info; } -DEFAULT_VERSION(bpf_prog_load_v0_6_0, bpf_prog_load, LIBBPF_0.6.0) -int bpf_prog_load_v0_6_0(enum bpf_prog_type prog_type, - const char *prog_name, const char *license, - const struct bpf_insn *insns, size_t insn_cnt, - const struct bpf_prog_load_opts *opts) +int bpf_prog_load (enum bpf_prog_type prog_type, +const char *prog_name,const char *license, +const struct bpf_insn *insns,size_t insn_cnt, +const struct bpf_prog_load_opts *opts) {void *finfo =NULL , *linfo =NULL ;const char *func_info, *line_info;
@@ -384,94 +383,6 @@ int bpf_prog_load_v0_6_0(enum bpf_prog_type prog_type,return libbpf_err_errno (fd); } -__attribute__((alias ("bpf_load_program_xattr2" ))) -int bpf_load_program_xattr (const struct bpf_load_program_attr *load_attr, -char *log_buf,size_t log_buf_sz); - -static int bpf_load_program_xattr2 (const struct bpf_load_program_attr *load_attr, -char *log_buf,size_t log_buf_sz) -{ -LIBBPF_OPTS (bpf_prog_load_opts, p); - -if (!load_attr || !log_buf != !log_buf_sz) -return libbpf_err (-EINVAL ); - - p.expected_attach_type = load_attr->expected_attach_type; -switch (load_attr->prog_type) { -case BPF_PROG_TYPE_STRUCT_OPS : -case BPF_PROG_TYPE_LSM : - p.attach_btf_id = load_attr->attach_btf_id; -break ; -case BPF_PROG_TYPE_TRACING : -case BPF_PROG_TYPE_EXT : - p.attach_btf_id = load_attr->attach_btf_id; - p.attach_prog_fd = load_attr->attach_prog_fd; -break ; -default : - p.prog_ifindex = load_attr->prog_ifindex; - p.kern_version = load_attr->kern_version; - } - p.log_level = load_attr->log_level; - p.log_buf = log_buf; - p.log_size = log_buf_sz; - p.prog_btf_fd = load_attr->prog_btf_fd; - p.func_info_rec_size = load_attr->func_info_rec_size; - p.func_info_cnt = load_attr->func_info_cnt; - p.func_info = load_attr->func_info; - p.line_info_rec_size = load_attr->line_info_rec_size; - p.line_info_cnt = load_attr->line_info_cnt; - p.line_info = load_attr->line_info; - p.prog_flags = load_attr->prog_flags; - -return bpf_prog_load (load_attr->prog_type, load_attr->name, load_attr->license, - load_attr->insns, load_attr->insns_cnt, &p); -} - -int bpf_load_program (enum bpf_prog_type type,const struct bpf_insn *insns, -size_t insns_cnt,const char *license, -__u32 kern_version,char *log_buf, -size_t log_buf_sz) -{ -struct bpf_load_program_attr load_attr; - -memset (&load_attr,0 ,sizeof (struct bpf_load_program_attr )); - load_attr.prog_type = type; - load_attr.expected_attach_type =0 ; - load_attr.name =NULL ; - load_attr.insns = insns; - load_attr.insns_cnt = insns_cnt; - load_attr.license = license; - load_attr.kern_version = kern_version; - -return bpf_load_program_xattr2 (&load_attr, log_buf, log_buf_sz); -} - -int bpf_verify_program (enum bpf_prog_type type,const struct bpf_insn *insns, -size_t insns_cnt,__u32 prog_flags,const char *license, -__u32 kern_version,char *log_buf,size_t log_buf_sz, -int log_level) -{ -union bpf_attr attr; -int fd; - -bump_rlimit_memlock (); - -memset (&attr,0 ,sizeof (attr)); - attr.prog_type = type; - attr.insn_cnt = (__u32 )insns_cnt; - attr.insns =ptr_to_u64 (insns); - attr.license =ptr_to_u64 (license); - attr.log_buf =ptr_to_u64 (log_buf); - attr.log_size = log_buf_sz; - attr.log_level = log_level; - log_buf[0 ] =0 ; - attr.kern_version = kern_version; - attr.prog_flags = prog_flags; - - fd =sys_bpf_prog_load (&attr,sizeof (attr),PROG_LOAD_ATTEMPTS ); -return libbpf_err_errno (fd); -} -int bpf_map_update_elem (int fd,const void *key,const void *value,__u64 flags) {
@@ -910,62 +821,6 @@ int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,return libbpf_err_errno (ret); } -int bpf_prog_test_run (int prog_fd,int repeat,void *data,__u32 size, -void *data_out,__u32 *size_out,__u32 *retval, -__u32 *duration) -{ -union bpf_attr attr; -int ret; - -memset (&attr,0 ,sizeof (attr)); - attr.test.prog_fd = prog_fd; - attr.test.data_in =ptr_to_u64 (data); - attr.test.data_out =ptr_to_u64 (data_out); - attr.test.data_size_in = size; - attr.test.repeat = repeat; - - ret =sys_bpf (BPF_PROG_TEST_RUN , &attr,sizeof (attr)); - -if (size_out) - *size_out = attr.test.data_size_out; -if (retval) - *retval = attr.test.retval; -if (duration) - *duration = attr.test.duration; - -return libbpf_err_errno (ret); -} - -int bpf_prog_test_run_xattr (struct bpf_prog_test_run_attr *test_attr) -{ -union bpf_attr attr; -int ret; - -if (!test_attr->data_out && test_attr->data_size_out >0 ) -return libbpf_err (-EINVAL ); - -memset (&attr,0 ,sizeof (attr)); - attr.test.prog_fd = test_attr->prog_fd; - attr.test.data_in =ptr_to_u64 (test_attr->data_in); - attr.test.data_out =ptr_to_u64 (test_attr->data_out); - attr.test.data_size_in = test_attr->data_size_in; - attr.test.data_size_out = test_attr->data_size_out; - attr.test.ctx_in =ptr_to_u64 (test_attr->ctx_in); - attr.test.ctx_out =ptr_to_u64 (test_attr->ctx_out); - attr.test.ctx_size_in = test_attr->ctx_size_in; - attr.test.ctx_size_out = test_attr->ctx_size_out; - attr.test.repeat = test_attr->repeat; - - ret =sys_bpf (BPF_PROG_TEST_RUN , &attr,sizeof (attr)); - - test_attr->data_size_out = attr.test.data_size_out; - test_attr->ctx_size_out = attr.test.ctx_size_out; - test_attr->retval = attr.test.retval; - test_attr->duration = attr.test.duration; - -return libbpf_err_errno (ret); -} -int bpf_prog_test_run_opts (int prog_fd,struct bpf_test_run_opts *opts) {union bpf_attr attr;
@@ -1162,27 +1017,6 @@ int bpf_btf_load(const void *btf_data, size_t btf_size, const struct bpf_btf_loareturn libbpf_err_errno (fd); } -int bpf_load_btf (const void *btf,__u32 btf_size,char *log_buf,__u32 log_buf_size,bool do_log) -{ -LIBBPF_OPTS (bpf_btf_load_opts, opts); -int fd; - -retry: -if (do_log && log_buf && log_buf_size) { - opts.log_buf = log_buf; - opts.log_size = log_buf_size; - opts.log_level =1 ; - } - - fd =bpf_btf_load (btf, btf_size, &opts); -if (fd <0 && !do_log && log_buf && log_buf_size) { - do_log = true; - goto retry; - } - -return libbpf_err_errno (fd); -} -int bpf_task_fd_query (int pid,int fd,__u32 flags,char *buf,__u32 *buf_len,__u32 *prog_id,__u32 *fd_type,__u64 *probe_offset,__u64 *probe_addr)
tools/lib/bpf/bpf.h +0 -83
113 lines not on this page · raw message
tools/lib/bpf/libbpf.c +0 -89
95 lines not on this page · raw message
tools/lib/bpf/libbpf.h +0 -16
@@ -1164,22 +1164,6 @@ LIBBPF_API int bpf_map__get_next_key(const struct bpf_map *map,*/ LIBBPF_API long libbpf_get_error (const void *ptr); -struct bpf_prog_load_attr { -const char *file; -enum bpf_prog_type prog_type; -enum bpf_attach_type expected_attach_type; -int ifindex; -int log_level; -int prog_flags; -}; - -LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_object__open() and bpf_object__load() instead") -LIBBPF_API int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, -struct bpf_object **pobj,int *prog_fd); -LIBBPF_DEPRECATED_SINCE(0, 7, "use bpf_object__open() and bpf_object__load() instead") -LIBBPF_API int bpf_prog_load_deprecated(const char *file, enum bpf_prog_type type, -struct bpf_object **pobj,int *prog_fd); -/* XDP related API */ struct xdp_link_info {__u32 prog_id;
tools/lib/bpf/libbpf.map +0 -16
@@ -1,15 +1,6 @@ LIBBPF_0.0.1 { global: bpf_btf_get_fd_by_id; - bpf_create_map; - bpf_create_map_in_map; - bpf_create_map_in_map_node; - bpf_create_map_name; - bpf_create_map_node; - bpf_create_map_xattr; - bpf_load_btf; - bpf_load_program; - bpf_load_program_xattr; bpf_map__btf_key_type_id; bpf_map__btf_value_type_id; bpf_map__def;
@@ -61,11 +52,7 @@ LIBBPF_0.0.1 { bpf_prog_detach2; bpf_prog_get_fd_by_id; bpf_prog_get_next_id; - bpf_prog_load; - bpf_prog_load_xattr; bpf_prog_query; - bpf_prog_test_run; - bpf_prog_test_run_xattr; bpf_program__fd; bpf_program__is_kprobe; bpf_program__is_perf_event;
@@ -106,7 +93,6 @@ LIBBPF_0.0.1 { bpf_raw_tracepoint_open; bpf_set_link_xdp_fd; bpf_task_fd_query; - bpf_verify_program; btf__fd; btf__find_by_name; btf__free;
@@ -218,7 +204,6 @@ LIBBPF_0.0.7 { bpf_object__load_skeleton; bpf_object__open_skeleton; bpf_probe_large_insn_limit; - bpf_prog_attach_xattr; bpf_program__attach; bpf_program__name; bpf_program__is_extension;
@@ -387,7 +372,6 @@ LIBBPF_0.6.0 { bpf_object__next_program; bpf_object__prev_map; bpf_object__prev_program; - bpf_prog_load_deprecated; bpf_prog_load; bpf_program__flags; bpf_program__insn_cnt;
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 3/15 libbpf: remove deprecated XDP APIs
In reply to Andrii NakryikoGet rid of deprecated bpf_set_link*() and bpf_get_link*() APIs.
--- tools/lib/bpf/libbpf.h | 20 ------------- tools/lib/bpf/libbpf.map | 4 --- tools/lib/bpf/netlink.c | 62 ++++++---------------------------------- 3 files changed, 8 insertions(+), 78 deletions(-)
tools/lib/bpf/libbpf.h +0 -20
@@ -1164,15 +1164,6 @@ LIBBPF_API int bpf_map__get_next_key(const struct bpf_map *map,*/ LIBBPF_API long libbpf_get_error (const void *ptr); -/* XDP related API */ -struct xdp_link_info { -__u32 prog_id; -__u32 drv_prog_id; -__u32 hw_prog_id; -__u32 skb_prog_id; -__u8 attach_mode; -}; -struct bpf_xdp_set_link_opts {size_t sz;int old_fd;
@@ -1180,17 +1171,6 @@ struct bpf_xdp_set_link_opts { };#define bpf_xdp_set_link_opts__last_field old_fd -LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_attach() instead") -LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); -LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_attach() instead") -LIBBPF_API int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags, -const struct bpf_xdp_set_link_opts *opts); -LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_query_id() instead") -LIBBPF_API int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags); -LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_query() instead") -LIBBPF_API int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info, -size_t info_size,__u32 flags); -struct bpf_xdp_attach_opts {size_t sz;int old_prog_fd;
tools/lib/bpf/libbpf.map +0 -4
@@ -91,7 +91,6 @@ LIBBPF_0.0.1 { bpf_prog_linfo__lfind_addr_func; bpf_prog_linfo__lfind; bpf_raw_tracepoint_open; - bpf_set_link_xdp_fd; bpf_task_fd_query; btf__fd; btf__find_by_name;
@@ -120,7 +119,6 @@ LIBBPF_0.0.2 { bpf_map_lookup_elem_flags; bpf_object__btf; bpf_object__find_map_fd_by_name; - bpf_get_link_xdp_id; btf__dedup; btf__get_map_kv_tids; btf__get_nr_types;
@@ -172,7 +170,6 @@ LIBBPF_0.0.5 { LIBBPF_0.0.6 { global: - bpf_get_link_xdp_info; bpf_map__get_pin_path; bpf_map__is_pinned; bpf_map__set_pin_path;
@@ -231,7 +228,6 @@ LIBBPF_0.0.8 { bpf_program__is_lsm; bpf_program__set_attach_target; bpf_program__set_lsm; - bpf_set_link_xdp_fd_opts; } LIBBPF_0.0.7; LIBBPF_0.0.9 {
tools/lib/bpf/netlink.c +8 -54
86 lines not on this page · raw message
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 4/15 libbpf: remove deprecated probing APIs
In reply to Andrii NakryikoGet rid of deprecated feature-probing APIs.
--- tools/lib/bpf/libbpf.h | 8 --- tools/lib/bpf/libbpf.map | 4 -- tools/lib/bpf/libbpf_probes.c | 125 ++-------------------------------- 3 files changed, 5 insertions(+), 132 deletions(-)
tools/lib/bpf/libbpf.h +0 -8
@@ -1412,14 +1412,6 @@ bpf_prog_linfo__lfind(const struct bpf_prog_linfo *prog_linfo,* user, causing subsequent probes to fail. In this case, the caller may want * to adjust that limit with setrlimit(). */ -LIBBPF_DEPRECATED_SINCE(0, 8, "use libbpf_probe_bpf_prog_type() instead") -LIBBPF_API bool bpf_probe_prog_type(enum bpf_prog_type prog_type, __u32 ifindex); -LIBBPF_DEPRECATED_SINCE(0, 8, "use libbpf_probe_bpf_map_type() instead") -LIBBPF_API bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex); -LIBBPF_DEPRECATED_SINCE(0, 8, "use libbpf_probe_bpf_helper() instead") -LIBBPF_API bool bpf_probe_helper(enum bpf_func_id id, enum bpf_prog_type prog_type, __u32 ifindex); -LIBBPF_DEPRECATED_SINCE(0, 8, "implement your own or use bpftool for feature detection") -LIBBPF_API bool bpf_probe_large_insn_limit(__u32 ifindex);/** * @brief **libbpf_probe_bpf_prog_type()** detects if host kernel supports
tools/lib/bpf/libbpf.map +0 -4
@@ -112,9 +112,6 @@ LIBBPF_0.0.1 { LIBBPF_0.0.2 { global: - bpf_probe_helper; - bpf_probe_map_type; - bpf_probe_prog_type; bpf_map__resize; bpf_map_lookup_elem_flags; bpf_object__btf;
@@ -200,7 +197,6 @@ LIBBPF_0.0.7 { bpf_object__detach_skeleton; bpf_object__load_skeleton; bpf_object__open_skeleton; - bpf_probe_large_insn_limit; bpf_program__attach; bpf_program__name; bpf_program__is_extension;
tools/lib/bpf/libbpf_probes.c +5 -120
183 lines not on this page · raw message
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 5/15 libbpf: remove deprecated BTF APIs
In reply to Andrii NakryikoGet rid of deprecated BTF-related APIs.
--- tools/lib/bpf/btf.c | 183 +-------------------------------------- tools/lib/bpf/btf.h | 86 +----------------- tools/lib/bpf/btf_dump.c | 23 ++--- tools/lib/bpf/libbpf.c | 44 +++------- tools/lib/bpf/libbpf.map | 13 --- 5 files changed, 24 insertions(+), 325 deletions(-)
tools/lib/bpf/btf.c +1 -182
@@ -448,11 +448,6 @@ static int btf_parse_type_sec(struct btf *btf)return 0 ; } -__u32 btf__get_nr_types (const struct btf *btf) -{ -return btf->start_id + btf->nr_types -1 ; -} -__u32 btf__type_cnt (const struct btf *btf) {return btf->start_id + btf->nr_types;
@@ -1408,92 +1403,6 @@ struct btf *btf__load_from_kernel_by_id(__u32 id)return btf__load_from_kernel_by_id_split (id,NULL ); } -int btf__get_from_id (__u32 id,struct btf **btf) -{ -struct btf *res; -int err; - - *btf =NULL ; - res =btf__load_from_kernel_by_id (id); - err =libbpf_get_error (res); - -if (err) -return libbpf_err (err); - - *btf = res; -return 0 ; -} - -int btf__get_map_kv_tids (const struct btf *btf,const char *map_name, -__u32 expected_key_size,__u32 expected_value_size, -__u32 *key_type_id,__u32 *value_type_id) -{ -const struct btf_type *container_type; -const struct btf_member *key, *value; -const size_t max_name =256 ; -char container_name[max_name]; -__s64 key_size, value_size; -__s32 container_id; - -if (snprintf (container_name, max_name,"____btf_map_%s" , map_name) == max_name) { -pr_warn ("map:%s length of '____btf_map_%s' is too long\n" , - map_name, map_name); -return libbpf_err (-EINVAL ); - } - - container_id =btf__find_by_name (btf, container_name); -if (container_id <0 ) { -pr_debug ("map:%s container_name:%s cannot be found in BTF. Missing BPF_ANNOTATE_KV_PAIR?\n" , - map_name, container_name); -return libbpf_err (container_id); - } - - container_type =btf__type_by_id (btf, container_id); -if (!container_type) { -pr_warn ("map:%s cannot find BTF type for container_id:%u\n" , - map_name, container_id); -return libbpf_err (-EINVAL ); - } - -if (!btf_is_struct (container_type) ||btf_vlen (container_type) <2 ) { -pr_warn ("map:%s container_name:%s is an invalid container struct\n" , - map_name, container_name); -return libbpf_err (-EINVAL ); - } - - key =btf_members (container_type); - value = key +1 ; - - key_size =btf__resolve_size (btf, key->type); -if (key_size <0 ) { -pr_warn ("map:%s invalid BTF key_type_size\n" , map_name); -return libbpf_err (key_size); - } - -if (expected_key_size != key_size) { -pr_warn ("map:%s btf_key_type_size:%u != map_def_key_size:%u\n" , - map_name, (__u32 )key_size, expected_key_size); -return libbpf_err (-EINVAL ); - } - - value_size =btf__resolve_size (btf, value->type); -if (value_size <0 ) { -pr_warn ("map:%s invalid BTF value_type_size\n" , map_name); -return libbpf_err (value_size); - } - -if (expected_value_size != value_size) { -pr_warn ("map:%s btf_value_type_size:%u != map_def_value_size:%u\n" , - map_name, (__u32 )value_size, expected_value_size); -return libbpf_err (-EINVAL ); - } - - *key_type_id = key->type; - *value_type_id = value->type; - -return 0 ; -} -static void btf_invalidate_raw_data (struct btf *btf) {if (btf->raw_data) {
@@ -2965,81 +2874,6 @@ const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size)return btf_ext->data; } -static int btf_ext_reloc_info (const struct btf *btf, -const struct btf_ext_info *ext_info, -const char *sec_name,__u32 insns_cnt, -void **info,__u32 *cnt) -{ -__u32 sec_hdrlen =sizeof (struct btf_ext_info_sec ); -__u32 i, record_size, existing_len, records_len; -struct btf_ext_info_sec *sinfo; -const char *info_sec_name; -__u64 remain_len; -void *data; - - record_size = ext_info->rec_size; - sinfo = ext_info->info; - remain_len = ext_info->len; -while (remain_len >0 ) { - records_len = sinfo->num_info * record_size; - info_sec_name =btf__name_by_offset (btf, sinfo->sec_name_off); -if (strcmp (info_sec_name, sec_name)) { - remain_len -= sec_hdrlen + records_len; - sinfo = (void *)sinfo + sec_hdrlen + records_len; -continue ; - } - - existing_len = (*cnt) * record_size; - data =realloc (*info, existing_len + records_len); -if (!data) -return libbpf_err (-ENOMEM ); - -memcpy (data + existing_len, sinfo->data, records_len); -/* adjust insn_off only, the rest data will be passed -* to the kernel. -*/ -for (i =0 ; i < sinfo->num_info; i++) { -__u32 *insn_off; - - insn_off = data + existing_len + (i * record_size); - *insn_off = *insn_off /sizeof (struct bpf_insn ) + insns_cnt; - } - *info = data; - *cnt += sinfo->num_info; -return 0 ; - } - -return libbpf_err (-ENOENT ); -} - -int btf_ext__reloc_func_info (const struct btf *btf, -const struct btf_ext *btf_ext, -const char *sec_name,__u32 insns_cnt, -void **func_info,__u32 *cnt) -{ -return btf_ext_reloc_info (btf, &btf_ext->func_info, sec_name, - insns_cnt, func_info, cnt); -} - -int btf_ext__reloc_line_info (const struct btf *btf, -const struct btf_ext *btf_ext, -const char *sec_name,__u32 insns_cnt, -void **line_info,__u32 *cnt) -{ -return btf_ext_reloc_info (btf, &btf_ext->line_info, sec_name, - insns_cnt, line_info, cnt); -} - -__u32 btf_ext__func_info_rec_size (const struct btf_ext *btf_ext) -{ -return btf_ext->func_info.rec_size; -} - -__u32 btf_ext__line_info_rec_size (const struct btf_ext *btf_ext) -{ -return btf_ext->line_info.rec_size; -} -struct btf_dedup ;static struct btf_dedup *btf_dedup_new (struct btf *btf,const struct btf_dedup_opts *opts);
@@ -3189,9 +3023,7 @@ static int btf_dedup_remap_types(struct btf_dedup *d);* deduplicating structs/unions is described in greater details in comments for * `btf_dedup_is_equiv` function. */ - -DEFAULT_VERSION(btf__dedup_v0_6_0, btf__dedup, LIBBPF_0.6.0) -int btf__dedup_v0_6_0(struct btf *btf, const struct btf_dedup_opts *opts) +int btf__dedup (struct btf *btf,const struct btf_dedup_opts *opts) {struct btf_dedup *d;int err;
@@ -3251,19 +3083,6 @@ int btf__dedup_v0_6_0(struct btf *btf, const struct btf_dedup_opts *opts)return libbpf_err (err); } -COMPAT_VERSION(btf__dedup_deprecated, btf__dedup, LIBBPF_0.0.2) -int btf__dedup_deprecated(struct btf *btf, struct btf_ext *btf_ext, const void *unused_opts) -{ - LIBBPF_OPTS(btf_dedup_opts, opts, .btf_ext = btf_ext); - - if (unused_opts) { - pr_warn("please use new version of btf__dedup() that supports options\n"); - return libbpf_err(-ENOTSUP); - } - - return btf__dedup(btf, &opts); -} -#define BTF_UNPROCESSED_ID ((__u32)-1)#define BTF_IN_PROGRESS_ID ((__u32)-2)
tools/lib/bpf/btf.h +2 -84
124 lines not on this page · raw message
tools/lib/bpf/btf_dump.c +7 -16
@@ -144,15 +144,17 @@ static void btf_dump_printf(const struct btf_dump *d, const char *fmt, ...)static int btf_dump_mark_referenced (struct btf_dump *d);static int btf_dump_resize (struct btf_dump *d); -DEFAULT_VERSION(btf_dump__new_v0_6_0, btf_dump__new, LIBBPF_0.6.0) -struct btf_dump *btf_dump__new_v0_6_0(const struct btf *btf, - btf_dump_printf_fn_t printf_fn, - void *ctx, - const struct btf_dump_opts *opts) +struct btf_dump *btf_dump__new (const struct btf *btf, +btf_dump_printf_fn_t printf_fn, +void *ctx, +const struct btf_dump_opts *opts) {struct btf_dump *d;int err; +if (!OPTS_VALID (opts, btf_dump_opts)) +return libbpf_err_ptr (-EINVAL ); +if (!printf_fn)return libbpf_err_ptr (-EINVAL );
@@ -188,17 +190,6 @@ struct btf_dump *btf_dump__new_v0_6_0(const struct btf *btf,return libbpf_err_ptr (err); } -COMPAT_VERSION(btf_dump__new_deprecated, btf_dump__new, LIBBPF_0.0.4) -struct btf_dump *btf_dump__new_deprecated(const struct btf *btf, - const struct btf_ext *btf_ext, - const struct btf_dump_opts *opts, - btf_dump_printf_fn_t printf_fn) -{ -if (!printf_fn) -return libbpf_err_ptr (-EINVAL ); -return btf_dump__new_v0_6_0 (btf, printf_fn, opts ? opts->ctx :NULL , opts); -} -static int btf_dump_resize (struct btf_dump *d) {int err, last_id =btf__type_cnt (d->btf) -1 ;
tools/lib/bpf/libbpf.c +14 -30
65 lines not on this page · raw message
tools/lib/bpf/libbpf.map +0 -13
@@ -95,7 +95,6 @@ LIBBPF_0.0.1 { btf__fd; btf__find_by_name; btf__free; - btf__get_from_id; btf__name_by_offset; btf__new; btf__resolve_size;
@@ -116,18 +115,10 @@ LIBBPF_0.0.2 { bpf_map_lookup_elem_flags; bpf_object__btf; bpf_object__find_map_fd_by_name; - btf__dedup; - btf__get_map_kv_tids; - btf__get_nr_types; btf__get_raw_data; - btf__load; btf_ext__free; - btf_ext__func_info_rec_size; btf_ext__get_raw_data; - btf_ext__line_info_rec_size; btf_ext__new; - btf_ext__reloc_func_info; - btf_ext__reloc_line_info; bpf_program__get_prog_info_linear; bpf_program__bpil_addr_to_offs; bpf_program__bpil_offs_to_addr;
@@ -137,7 +128,6 @@ LIBBPF_0.0.3 { global: bpf_map__is_internal; bpf_map_freeze; - btf__finalize_data; } LIBBPF_0.0.2; LIBBPF_0.0.4 {
@@ -151,7 +141,6 @@ LIBBPF_0.0.4 { bpf_program__attach_uprobe; btf_dump__dump_type; btf_dump__free; - btf_dump__new; btf__parse_elf; libbpf_num_possible_cpus; perf_buffer__free;
@@ -373,11 +362,9 @@ LIBBPF_0.6.0 { btf__add_decl_tag; btf__add_type_tag; btf__dedup; - btf__dedup_deprecated; btf__raw_data; btf__type_cnt; btf_dump__new; - btf_dump__new_deprecated; libbpf_major_version; libbpf_minor_version; libbpf_version_string;
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 6/15 libbpf: clean up perfbuf APIs
In reply to Andrii NakryikoRemove deprecated perfbuf APIs and clean up opts structs.
--- tools/lib/bpf/libbpf.c | 54 +++++++----------------------- tools/lib/bpf/libbpf.h | 71 ++++------------------------------------ tools/lib/bpf/libbpf.map | 5 --- 3 files changed, 18 insertions(+), 112 deletions(-)
tools/lib/bpf/libbpf.c +12 -42
@@ -11975,6 +11975,9 @@ struct bpf_link *bpf_map__attach_struct_ops(const struct bpf_map *map)return link; } +typedef enum bpf_perf_event_ret (*bpf_perf_event_print_t )(struct perf_event_header *hdr, +void *private_data); + static enum bpf_perf_event_ret perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size, void **copy_mem, size_t *copy_size,
@@ -12023,12 +12026,6 @@ perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,return libbpf_err (ret); } -__attribute__((alias ("perf_event_read_simple" ))) -enum bpf_perf_event_ret -bpf_perf_event_read_simple (void *mmap_mem,size_t mmap_size,size_t page_size, -void **copy_mem,size_t *copy_size, -bpf_perf_event_print_t fn,void *private_data); -struct perf_buffer ;struct perf_buffer_params {
@@ -12162,12 +12159,11 @@ perf_buffer__open_cpu_buf(struct perf_buffer *pb, struct perf_event_attr *attr,static struct perf_buffer *__perf_buffer__new (int map_fd,size_t page_cnt,struct perf_buffer_params *p); -DEFAULT_VERSION(perf_buffer__new_v0_6_0, perf_buffer__new, LIBBPF_0.6.0) -struct perf_buffer *perf_buffer__new_v0_6_0(int map_fd, size_t page_cnt, - perf_buffer_sample_fn sample_cb, - perf_buffer_lost_fn lost_cb, - void *ctx, - const struct perf_buffer_opts *opts) +struct perf_buffer *perf_buffer__new (int map_fd,size_t page_cnt, +perf_buffer_sample_fn sample_cb, +perf_buffer_lost_fn lost_cb, +void *ctx, +const struct perf_buffer_opts *opts) {struct perf_buffer_params p = {};struct perf_event_attr attr = {};
@@ -12189,22 +12185,10 @@ struct perf_buffer *perf_buffer__new_v0_6_0(int map_fd, size_t page_cnt,return libbpf_ptr (__perf_buffer__new (map_fd, page_cnt, &p)); } -COMPAT_VERSION(perf_buffer__new_deprecated, perf_buffer__new, LIBBPF_0.0.4) -struct perf_buffer *perf_buffer__new_deprecated(int map_fd, size_t page_cnt, - const struct perf_buffer_opts *opts) -{ - return perf_buffer__new_v0_6_0(map_fd, page_cnt, - opts ? opts->sample_cb : NULL, - opts ? opts->lost_cb : NULL, - opts ? opts->ctx : NULL, - NULL); -} - -DEFAULT_VERSION(perf_buffer__new_raw_v0_6_0, perf_buffer__new_raw, LIBBPF_0.6.0) -struct perf_buffer *perf_buffer__new_raw_v0_6_0(int map_fd, size_t page_cnt, - struct perf_event_attr *attr, - perf_buffer_event_fn event_cb, void *ctx, - const struct perf_buffer_raw_opts *opts) +struct perf_buffer *perf_buffer__new_raw (int map_fd,size_t page_cnt, +struct perf_event_attr *attr, +perf_buffer_event_fn event_cb,void *ctx, +const struct perf_buffer_raw_opts *opts) {struct perf_buffer_params p = {};
@@ -12224,20 +12208,6 @@ struct perf_buffer *perf_buffer__new_raw_v0_6_0(int map_fd, size_t page_cnt,return libbpf_ptr (__perf_buffer__new (map_fd, page_cnt, &p)); } -COMPAT_VERSION(perf_buffer__new_raw_deprecated, perf_buffer__new_raw, LIBBPF_0.0.4) -struct perf_buffer *perf_buffer__new_raw_deprecated(int map_fd, size_t page_cnt, - const struct perf_buffer_raw_opts *opts) -{ -LIBBPF_OPTS (perf_buffer_raw_opts, inner_opts, - .cpu_cnt = opts->cpu_cnt, - .cpus = opts->cpus, - .map_keys = opts->map_keys, - ); - -return perf_buffer__new_raw_v0_6_0 (map_fd, page_cnt, opts->attr, - opts->event_cb, opts->ctx, &inner_opts); -} -static struct perf_buffer *__perf_buffer__new (int map_fd,size_t page_cnt,struct perf_buffer_params *p) {
tools/lib/bpf/libbpf.h +6 -65
106 lines not on this page · raw message
tools/lib/bpf/libbpf.map +0 -5
@@ -46,7 +46,6 @@ LIBBPF_0.0.1 { bpf_object__unload; bpf_object__unpin_maps; bpf_object__unpin_programs; - bpf_perf_event_read_simple; bpf_prog_attach; bpf_prog_detach; bpf_prog_detach2;
@@ -144,8 +143,6 @@ LIBBPF_0.0.4 { btf__parse_elf; libbpf_num_possible_cpus; perf_buffer__free; - perf_buffer__new; - perf_buffer__new_raw; perf_buffer__poll; } LIBBPF_0.0.3;
@@ -369,9 +366,7 @@ LIBBPF_0.6.0 { libbpf_minor_version; libbpf_version_string; perf_buffer__new; - perf_buffer__new_deprecated; perf_buffer__new_raw; - perf_buffer__new_raw_deprecated; } LIBBPF_0.5.0; LIBBPF_0.7.0 {
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 7/15 libbpf: remove prog_info_linear APIs
In reply to Andrii NakryikoRemove prog_info_linear-related APIs previously used by perf.
--- tools/lib/bpf/libbpf.c | 248 --------------------------------------- tools/lib/bpf/libbpf.h | 66 ----------- tools/lib/bpf/libbpf.map | 3 - 3 files changed, 317 deletions(-)
tools/lib/bpf/libbpf.c +0 -248
@@ -12509,254 +12509,6 @@ int perf_buffer__consume(struct perf_buffer *pb)return 0 ; } -struct bpf_prog_info_array_desc { -int array_offset;/* e.g. offset of jited_prog_insns */ -int count_offset;/* e.g. offset of jited_prog_len */ -int size_offset;/* > 0: offset of rec size, -* < 0: fix size of -size_offset -*/ -}; - -static struct bpf_prog_info_array_desc bpf_prog_info_array_desc[] = { - [BPF_PROG_INFO_JITED_INSNS ] = { - offsetof(struct bpf_prog_info , jited_prog_insns), - offsetof(struct bpf_prog_info , jited_prog_len), --1 , - }, - [BPF_PROG_INFO_XLATED_INSNS ] = { - offsetof(struct bpf_prog_info , xlated_prog_insns), - offsetof(struct bpf_prog_info , xlated_prog_len), --1 , - }, - [BPF_PROG_INFO_MAP_IDS ] = { - offsetof(struct bpf_prog_info , map_ids), - offsetof(struct bpf_prog_info , nr_map_ids), - -(int )sizeof (__u32), - }, - [BPF_PROG_INFO_JITED_KSYMS ] = { - offsetof(struct bpf_prog_info , jited_ksyms), - offsetof(struct bpf_prog_info , nr_jited_ksyms), - -(int )sizeof (__u64), - }, - [BPF_PROG_INFO_JITED_FUNC_LENS ] = { - offsetof(struct bpf_prog_info , jited_func_lens), - offsetof(struct bpf_prog_info , nr_jited_func_lens), - -(int )sizeof (__u32), - }, - [BPF_PROG_INFO_FUNC_INFO ] = { - offsetof(struct bpf_prog_info , func_info), - offsetof(struct bpf_prog_info , nr_func_info), - offsetof(struct bpf_prog_info , func_info_rec_size), - }, - [BPF_PROG_INFO_LINE_INFO ] = { - offsetof(struct bpf_prog_info , line_info), - offsetof(struct bpf_prog_info , nr_line_info), - offsetof(struct bpf_prog_info , line_info_rec_size), - }, - [BPF_PROG_INFO_JITED_LINE_INFO ] = { - offsetof(struct bpf_prog_info , jited_line_info), - offsetof(struct bpf_prog_info , nr_jited_line_info), - offsetof(struct bpf_prog_info , jited_line_info_rec_size), - }, - [BPF_PROG_INFO_PROG_TAGS ] = { - offsetof(struct bpf_prog_info , prog_tags), - offsetof(struct bpf_prog_info , nr_prog_tags), - -(int )sizeof (__u8) *BPF_TAG_SIZE , - }, - -}; - -static __u32 bpf_prog_info_read_offset_u32 (struct bpf_prog_info *info, -int offset) -{ -__u32 *array = (__u32 *)info; - -if (offset >=0 ) -return array[offset /sizeof (__u32)]; -return -(int )offset; -} - -static __u64 bpf_prog_info_read_offset_u64 (struct bpf_prog_info *info, -int offset) -{ -__u64 *array = (__u64 *)info; - -if (offset >=0 ) -return array[offset /sizeof (__u64)]; -return -(int )offset; -} - -static void bpf_prog_info_set_offset_u32 (struct bpf_prog_info *info,int offset, -__u32 val) -{ -__u32 *array = (__u32 *)info; - -if (offset >=0 ) - array[offset /sizeof (__u32)] = val; -} - -static void bpf_prog_info_set_offset_u64 (struct bpf_prog_info *info,int offset, -__u64 val) -{ -__u64 *array = (__u64 *)info; - -if (offset >=0 ) - array[offset /sizeof (__u64)] = val; -} - -struct bpf_prog_info_linear * -bpf_program__get_prog_info_linear (int fd,__u64 arrays) -{ -struct bpf_prog_info_linear *info_linear; -struct bpf_prog_info info = {}; -__u32 info_len =sizeof (info); -__u32 data_len =0 ; -int i, err; -void *ptr; - -if (arrays >>BPF_PROG_INFO_LAST_ARRAY ) -return libbpf_err_ptr (-EINVAL ); - -/* step 1: get array dimensions */ - err =bpf_obj_get_info_by_fd (fd, &info, &info_len); -if (err) { -pr_debug ("can't get prog info: %s" ,strerror (errno)); -return libbpf_err_ptr (-EFAULT ); - } - -/* step 2: calculate total size of all arrays */ -for (i =BPF_PROG_INFO_FIRST_ARRAY ; i <BPF_PROG_INFO_LAST_ARRAY ; ++i) { -bool include_array = (arrays & (1UL << i)) >0 ; -struct bpf_prog_info_array_desc *desc; -__u32 count, size; - - desc = bpf_prog_info_array_desc + i; - -/* kernel is too old to support this field */ -if (info_len < desc->array_offset +sizeof (__u32) || - info_len < desc->count_offset +sizeof (__u32) || - (desc->size_offset >0 && info_len < desc->size_offset)) - include_array = false; - -if (!include_array) { - arrays &= ~(1UL << i);/* clear the bit */ -continue ; - } - - count =bpf_prog_info_read_offset_u32 (&info, desc->count_offset); - size =bpf_prog_info_read_offset_u32 (&info, desc->size_offset); - - data_len += count * size; - } - -/* step 3: allocate continuous memory */ - data_len =roundup (data_len,sizeof (__u64)); - info_linear =malloc (sizeof (struct bpf_prog_info_linear ) + data_len); -if (!info_linear) -return libbpf_err_ptr (-ENOMEM ); - -/* step 4: fill data to info_linear->info */ - info_linear->arrays = arrays; -memset (&info_linear->info,0 ,sizeof (info)); - ptr = info_linear->data; - -for (i =BPF_PROG_INFO_FIRST_ARRAY ; i <BPF_PROG_INFO_LAST_ARRAY ; ++i) { -struct bpf_prog_info_array_desc *desc; -__u32 count, size; - -if ((arrays & (1UL << i)) ==0 ) -continue ; - - desc = bpf_prog_info_array_desc + i; - count =bpf_prog_info_read_offset_u32 (&info, desc->count_offset); - size =bpf_prog_info_read_offset_u32 (&info, desc->size_offset); -bpf_prog_info_set_offset_u32 (&info_linear->info, - desc->count_offset, count); -bpf_prog_info_set_offset_u32 (&info_linear->info, - desc->size_offset, size); -bpf_prog_info_set_offset_u64 (&info_linear->info, - desc->array_offset, -ptr_to_u64 (ptr)); - ptr += count * size; - } - -/* step 5: call syscall again to get required arrays */ - err =bpf_obj_get_info_by_fd (fd, &info_linear->info, &info_len); -if (err) { -pr_debug ("can't get prog info: %s" ,strerror (errno)); -free (info_linear); -return libbpf_err_ptr (-EFAULT ); - } - -/* step 6: verify the data */ -for (i =BPF_PROG_INFO_FIRST_ARRAY ; i <BPF_PROG_INFO_LAST_ARRAY ; ++i) { -struct bpf_prog_info_array_desc *desc; -__u32 v1, v2; - -if ((arrays & (1UL << i)) ==0 ) -continue ; - - desc = bpf_prog_info_array_desc + i; - v1 =bpf_prog_info_read_offset_u32 (&info, desc->count_offset); - v2 =bpf_prog_info_read_offset_u32 (&info_linear->info, - desc->count_offset); -if (v1 != v2) -pr_warn ("%s: mismatch in element count\n" , __func__); - - v1 =bpf_prog_info_read_offset_u32 (&info, desc->size_offset); - v2 =bpf_prog_info_read_offset_u32 (&info_linear->info, - desc->size_offset); -if (v1 != v2) -pr_warn ("%s: mismatch in rec size\n" , __func__); - } - -/* step 7: update info_len and data_len */ - info_linear->info_len =sizeof (struct bpf_prog_info ); - info_linear->data_len = data_len; - -return info_linear; -} - -void bpf_program__bpil_addr_to_offs (struct bpf_prog_info_linear *info_linear) -{ -int i; - -for (i =BPF_PROG_INFO_FIRST_ARRAY ; i <BPF_PROG_INFO_LAST_ARRAY ; ++i) { -struct bpf_prog_info_array_desc *desc; -__u64 addr, offs; - -if ((info_linear->arrays & (1UL << i)) ==0 ) -continue ; - - desc = bpf_prog_info_array_desc + i; - addr =bpf_prog_info_read_offset_u64 (&info_linear->info, - desc->array_offset); - offs = addr -ptr_to_u64 (info_linear->data); -bpf_prog_info_set_offset_u64 (&info_linear->info, - desc->array_offset, offs); - } -} - -void bpf_program__bpil_offs_to_addr (struct bpf_prog_info_linear *info_linear) -{ -int i; - -for (i =BPF_PROG_INFO_FIRST_ARRAY ; i <BPF_PROG_INFO_LAST_ARRAY ; ++i) { -struct bpf_prog_info_array_desc *desc; -__u64 addr, offs; - -if ((info_linear->arrays & (1UL << i)) ==0 ) -continue ; - - desc = bpf_prog_info_array_desc + i; - offs =bpf_prog_info_read_offset_u64 (&info_linear->info, - desc->array_offset); - addr = offs +ptr_to_u64 (info_linear->data); -bpf_prog_info_set_offset_u64 (&info_linear->info, - desc->array_offset, addr); - } -} -int bpf_program__set_attach_target (struct bpf_program *prog,int attach_prog_fd,const char *attach_func_name)
tools/lib/bpf/libbpf.h +0 -66
72 lines not on this page · raw message
tools/lib/bpf/libbpf.map +0 -3
@@ -118,9 +118,6 @@ LIBBPF_0.0.2 { btf_ext__free; btf_ext__get_raw_data; btf_ext__new; - bpf_program__get_prog_info_linear; - bpf_program__bpil_addr_to_offs; - bpf_program__bpil_offs_to_addr; } LIBBPF_0.0.1; LIBBPF_0.0.3 {
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 8/15 libbpf: remove most other deprecated high-level APIs
In reply to Andrii NakryikoRemove a bunch of high-level bpf_object/bpf_map/bpf_program related APIs. All the APIs related to private per-object/map/prog state, program preprocessing callback, and generally everything multi-instance related is removed in a separate patch.
--- tools/lib/bpf/libbpf.c | 241 ++++----------------------------------- tools/lib/bpf/libbpf.h | 163 +------------------------- tools/lib/bpf/libbpf.map | 43 ------- 3 files changed, 26 insertions(+), 421 deletions(-)
tools/lib/bpf/libbpf.c +21 -220
@@ -31,7 +31,6 @@#include <linux/bpf.h> #include <linux/btf.h> #include <linux/filter.h> -#include <linux/list.h> #include <linux/limits.h> #include <linux/perf_event.h> #include <linux/ring_buffer.h>
@@ -484,6 +483,14 @@ enum libbpf_map_type { LIBBPF_MAP_KCONFIG, }; +struct bpf_map_def { +unsigned int type; +unsigned int key_size; +unsigned int value_size; +unsigned int max_entries; +unsigned int map_flags; +}; +struct bpf_map {struct bpf_object *obj;char *name;
@@ -568,8 +575,6 @@ struct extern_desc { }; }; -static LIST_HEAD (bpf_objects_list); -struct module_btf {struct btf *btf;char *name;
@@ -638,12 +643,6 @@ struct bpf_object {/* Information when doing ELF related work. Only valid if efile.elf is not NULL */ struct elf_state efile; -/* -* All loaded bpf_object are linked in a list, which is -* hidden to caller. bpf_objects__<func> handlers deal with -* all objects. -*/ -struct list_head list;struct btf *btf;struct btf_ext *btf_ext;
@@ -1313,7 +1312,6 @@ static struct bpf_object *bpf_object__new(const char *path,size_t obj_buf_sz, const char *obj_name) { - bool strict = (libbpf_mode & LIBBPF_STRICT_NO_OBJECT_LIST); struct bpf_object *obj;char *end;
@@ -1351,9 +1349,6 @@ static struct bpf_object *bpf_object__new(const char *path, obj->kern_version =get_kernel_version (); obj->loaded = false; -INIT_LIST_HEAD (&obj->list); -if (!strict) -list_add (&obj->list, &bpf_objects_list);return obj; }
@@ -1386,10 +1381,7 @@ static int bpf_object__elf_init(struct bpf_object *obj) }if (obj->efile.obj_buf_sz >0 ) { -/* -* obj_buf should have been validated by -* bpf_object__open_buffer(). -*/ +/* obj_buf should have been validated by bpf_object__open_mem(). */ elf =elf_memory ((char *)obj->efile.obj_buf, obj->efile.obj_buf_sz); }else { obj->efile.fd =open (obj->path,O_RDONLY |O_CLOEXEC );
@@ -2306,6 +2298,13 @@ static int build_map_pin_path(struct bpf_map *map, const char *path)return bpf_map__set_pin_path (map, buf); } +/* should match definition in bpf_helpers.h */ +enum libbpf_pin_type { +LIBBPF_PIN_NONE , +/* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */ +LIBBPF_PIN_BY_NAME , +}; +int parse_btf_map_def (const char *map_name,struct btf *btf,const struct btf_type *def_t,bool strict,struct btf_map_def *map_def,struct btf_map_def *inner_def)
@@ -4017,19 +4016,6 @@ static int bpf_object__collect_externs(struct bpf_object *obj)return 0 ; } -struct bpf_program * -bpf_object__find_program_by_title (const struct bpf_object *obj, -const char *title) -{ -struct bpf_program *pos; - -bpf_object__for_each_program (pos, obj) { -if (pos->sec_name && !strcmp (pos->sec_name, title)) -return pos; - } -return errno =ENOENT ,NULL ; -} -static bool prog_is_subprog (const struct bpf_object *obj,const struct bpf_program *prog) {
@@ -4548,14 +4534,6 @@ int bpf_map__set_max_entries(struct bpf_map *map, __u32 max_entries)return 0 ; } -int bpf_map__resize (struct bpf_map *map,__u32 max_entries) -{ -if (!map || !max_entries) -return libbpf_err (-EINVAL ); - -return bpf_map__set_max_entries (map, max_entries); -} -static int bpf_object__probe_loading (struct bpf_object *obj) {
@@ -7339,11 +7317,6 @@ static int bpf_object_load_prog(struct bpf_object *obj, struct bpf_program *progreturn libbpf_err (err); } -int bpf_program__load (struct bpf_program *prog,const char *license,__u32 kern_ver) -{ -return bpf_object_load_prog (prog->obj, prog, license, kern_ver); -} -static int bpf_object__load_progs (struct bpf_object *obj,int log_level) {
@@ -7395,13 +7368,6 @@ static int bpf_object_init_progs(struct bpf_object *obj, const struct bpf_object prog->type = prog->sec_def->prog_type; prog->expected_attach_type = prog->sec_def->expected_attach_type; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -if (prog->sec_def->prog_type ==BPF_PROG_TYPE_TRACING || - prog->sec_def->prog_type ==BPF_PROG_TYPE_EXT ) - prog->attach_prog_fd =OPTS_GET (opts, attach_prog_fd,0 ); -#pragma GCC diagnostic pop -/* sec_def can have custom callback which should be called * after bpf_program is initialized to adjust its properties */
@@ -7507,36 +7473,6 @@ static struct bpf_object *bpf_object_open(const char *path, const void *obj_buf,return ERR_PTR (err); } -static struct bpf_object * -__bpf_object__open_xattr (struct bpf_object_open_attr *attr,int flags) -{ -DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts, - .relaxed_maps = flags & MAPS_RELAX_COMPAT, - ); - -/* param validation */ -if (!attr->file) -return NULL ; - -pr_debug ("loading %s\n" , attr->file); -return bpf_object_open (attr->file,NULL ,0 , &opts); -} - -struct bpf_object *bpf_object__open_xattr (struct bpf_object_open_attr *attr) -{ -return libbpf_ptr (__bpf_object__open_xattr (attr,0 )); -} - -struct bpf_object *bpf_object__open (const char *path) -{ -struct bpf_object_open_attr attr = { - .file = path, - .prog_type =BPF_PROG_TYPE_UNSPEC , - }; - -return libbpf_ptr (__bpf_object__open_xattr (&attr,0 )); -} -struct bpf_object *bpf_object__open_file (const char *path,const struct bpf_object_open_opts *opts) {
@@ -7548,6 +7484,11 @@ bpf_object__open_file(const char *path, const struct bpf_object_open_opts *opts)return libbpf_ptr (bpf_object_open (path,NULL ,0 , opts)); } +struct bpf_object *bpf_object__open (const char *path) +{ +return bpf_object__open_file (path,NULL ); +} +struct bpf_object *bpf_object__open_mem (const void *obj_buf,size_t obj_buf_sz,const struct bpf_object_open_opts *opts)
@@ -7558,23 +7499,6 @@ bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,return libbpf_ptr (bpf_object_open (NULL , obj_buf, obj_buf_sz, opts)); } -struct bpf_object * -bpf_object__open_buffer (const void *obj_buf,size_t obj_buf_sz, -const char *name) -{ -DECLARE_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 errno =EINVAL ,NULL ; - -return libbpf_ptr (bpf_object_open (NULL , obj_buf, obj_buf_sz, &opts)); -} -static int bpf_object_unload (struct bpf_object *obj) {size_t i;
@@ -8007,11 +7931,6 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const chreturn libbpf_err (err); } -int bpf_object__load_xattr (struct bpf_object_load_attr *attr) -{ -return bpf_object_load (attr->obj, attr->log_level, attr->target_btf_path); -} -int bpf_object__load (struct bpf_object *obj) {return bpf_object_load (obj,0 ,NULL );
@@ -8642,33 +8561,9 @@ void bpf_object__close(struct bpf_object *obj) }zfree (&obj->programs); -list_del (&obj->list);free (obj); } -struct bpf_object * -bpf_object__next (struct bpf_object *prev) -{ -struct bpf_object *next; -bool strict = (libbpf_mode &LIBBPF_STRICT_NO_OBJECT_LIST ); - -if (strict) -return NULL ; - -if (!prev) - next =list_first_entry (&bpf_objects_list, - struct bpf_object, - list); -else - next =list_next_entry (prev, list); - -/* Empty list is noticed here so don't need checking on entry. */ -if (&next->list == &bpf_objects_list) -return NULL ; - -return next; -} -const char *bpf_object__name (const struct bpf_object *obj) {return obj ? obj->name :libbpf_err_ptr (-EINVAL );
@@ -8757,12 +8652,6 @@ __bpf_program__iter(const struct bpf_program *p, const struct bpf_object *obj,return &obj->programs[idx]; } -struct bpf_program * -bpf_program__next (struct bpf_program *prev,const struct bpf_object *obj) -{ -return bpf_object__next_program (obj, prev); -} -struct bpf_program *bpf_object__next_program (const struct bpf_object *obj,struct bpf_program *prev) {
@@ -8775,12 +8664,6 @@ bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)return prog; } -struct bpf_program * -bpf_program__prev (struct bpf_program *next,const struct bpf_object *obj) -{ -return bpf_object__prev_program (obj, next); -} -struct bpf_program *bpf_object__prev_program (const struct bpf_object *obj,struct bpf_program *next) {
@@ -8824,22 +8707,6 @@ const char *bpf_program__section_name(const struct bpf_program *prog)return prog->sec_name; } -const char *bpf_program__title (const struct bpf_program *prog,bool needs_copy) -{ -const char *title; - - title = prog->sec_name; -if (needs_copy) { - title =strdup (title); -if (!title) { -pr_warn ("failed to strdup program title\n" ); -return libbpf_err_ptr (-ENOMEM ); - } - } - -return title; -} -bool bpf_program__autoload (const struct bpf_program *prog) {return prog->autoload;
@@ -8861,11 +8728,6 @@ int bpf_program__fd(const struct bpf_program *prog)return bpf_program_nth_fd (prog,0 ); } -size_t bpf_program__size (const struct bpf_program *prog) -{ -return prog->insns_cnt *BPF_INSN_SZ ; -} -const struct bpf_insn *bpf_program__insns (const struct bpf_program *prog) {return prog->insns;
@@ -8967,39 +8829,6 @@ int bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type)return 0 ; } -static bool bpf_program__is_type (const struct bpf_program *prog, -enum bpf_prog_type type) -{ -return prog ? (prog->type == type) : false; -} - -#define BPF_PROG_TYPE_FNS (NAME ,TYPE ) \ -int bpf_program__set_##NAME(struct bpf_program *prog) \ -{ \ - if (!prog) \ - return libbpf_err(-EINVAL); \ - return bpf_program__set_type(prog, TYPE); \ -} \ - \ -bool bpf_program__is_##NAME(const struct bpf_program *prog) \ -{ \ - return bpf_program__is_type(prog, TYPE); \ -} \ - -BPF_PROG_TYPE_FNS (socket_filter,BPF_PROG_TYPE_SOCKET_FILTER ); -BPF_PROG_TYPE_FNS (lsm,BPF_PROG_TYPE_LSM ); -BPF_PROG_TYPE_FNS (kprobe,BPF_PROG_TYPE_KPROBE ); -BPF_PROG_TYPE_FNS (sched_cls,BPF_PROG_TYPE_SCHED_CLS ); -BPF_PROG_TYPE_FNS (sched_act,BPF_PROG_TYPE_SCHED_ACT ); -BPF_PROG_TYPE_FNS (tracepoint,BPF_PROG_TYPE_TRACEPOINT ); -BPF_PROG_TYPE_FNS (raw_tracepoint,BPF_PROG_TYPE_RAW_TRACEPOINT ); -BPF_PROG_TYPE_FNS (xdp,BPF_PROG_TYPE_XDP ); -BPF_PROG_TYPE_FNS (perf_event,BPF_PROG_TYPE_PERF_EVENT ); -BPF_PROG_TYPE_FNS (tracing,BPF_PROG_TYPE_TRACING ); -BPF_PROG_TYPE_FNS (struct_ops,BPF_PROG_TYPE_STRUCT_OPS ); -BPF_PROG_TYPE_FNS (extension,BPF_PROG_TYPE_EXT ); -BPF_PROG_TYPE_FNS (sk_lookup,BPF_PROG_TYPE_SK_LOOKUP ); -__alias (bpf_program__expected_attach_type) enum bpf_attach_type bpf_program__get_expected_attach_type(const struct bpf_program *prog);
@@ -9773,11 +9602,6 @@ int bpf_map__fd(const struct bpf_map *map)return map ? map->fd :libbpf_err (-EINVAL ); } -const struct bpf_map_def *bpf_map__def (const struct bpf_map *map) -{ -return map ? &map->def :libbpf_err_ptr (-EINVAL ); -} -static bool map_uses_real_name (const struct bpf_map *map) {/* Since libbpf started to support custom .data.* and .rodata.* maps,
@@ -9932,11 +9756,6 @@ const void *bpf_map__initial_value(struct bpf_map *map, size_t *psize)return map->mmaped; } -bool bpf_map__is_offload_neutral (const struct bpf_map *map) -{ -return map->def.type ==BPF_MAP_TYPE_PERF_EVENT_ARRAY ; -} -bool bpf_map__is_internal (const struct bpf_map *map) {return map->libbpf_type !=LIBBPF_MAP_UNSPEC ;
@@ -9997,12 +9816,6 @@ __bpf_map__iter(const struct bpf_map *m, const struct bpf_object *obj, int i)return &obj->maps[idx]; } -struct bpf_map * -bpf_map__next (const struct bpf_map *prev,const struct bpf_object *obj) -{ -return bpf_object__next_map (obj, prev); -} -struct bpf_map *bpf_object__next_map (const struct bpf_object *obj,const struct bpf_map *prev) {
@@ -10012,12 +9825,6 @@ bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)return __bpf_map__iter (prev, obj,1 ); } -struct bpf_map * -bpf_map__prev (const struct bpf_map *next,const struct bpf_object *obj) -{ -return bpf_object__prev_map (obj, next); -} -struct bpf_map *bpf_object__prev_map (const struct bpf_object *obj,const struct bpf_map *next) {
@@ -10063,12 +9870,6 @@ bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name)return bpf_map__fd (bpf_object__find_map_by_name (obj, name)); } -struct bpf_map * -bpf_object__find_map_by_offset (struct bpf_object *obj,size_t offset) -{ -return libbpf_err_ptr (-ENOTSUP ); -} -static int validate_map_op (const struct bpf_map *map,size_t key_sz,size_t value_sz,bool check_value_sz) {
tools/lib/bpf/libbpf.h +5 -158
272 lines not on this page · raw message
tools/lib/bpf/libbpf.map +0 -43
120 lines not on this page · raw message
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 9/15 libbpf: remove multi-instance and custom private data APIs
In reply to Andrii NakryikoRemove all the public APIs that are related to creating multi-instance bpf_programs through custom preprocessing callback and generally working with them.
Also remove all the bpf_{object,map,program}__[set_]priv() APIs.
--- tools/lib/bpf/libbpf.c | 121 ++++----------------------------------- tools/lib/bpf/libbpf.h | 91 ----------------------------- tools/lib/bpf/libbpf.map | 10 ---- 3 files changed, 10 insertions(+), 212 deletions(-)
tools/lib/bpf/libbpf.c +10 -111
@@ -366,6 +366,16 @@ struct bpf_sec_def {libbpf_prog_attach_fn_t prog_attach_fn; }; +struct bpf_prog_prep_result { +struct bpf_insn *new_insn_ptr; +int new_insn_cnt; +int *pfd; +}; + +typedef int (*bpf_program_prep_t )(struct bpf_program *prog,int n, +struct bpf_insn *insns,int insns_cnt, +struct bpf_prog_prep_result *res); +/* * bpf_prog should be a better name but it has been used in * linux/filter.h.
@@ -426,8 +436,6 @@ struct bpf_program {bpf_program_prep_t preprocessor;struct bpf_object *obj; -void *priv; -bpf_program_clear_priv_t clear_priv;bool autoload;bool mark_btf_static;
@@ -511,8 +519,6 @@ struct bpf_map {__u32 btf_key_type_id;__u32 btf_value_type_id;__u32 btf_vmlinux_value_type_id; -void *priv; -bpf_map_clear_priv_t clear_priv;enum libbpf_map_type libbpf_type;void *mmaped;struct bpf_struct_ops *st_ops;
@@ -668,9 +674,6 @@ struct bpf_object {size_t log_size;__u32 log_level; -void *priv; -bpf_object_clear_priv_t clear_priv; -int *fd_array;size_t fd_array_cap;size_t fd_array_cnt;
@@ -721,12 +724,6 @@ static void bpf_program__exit(struct bpf_program *prog)if (!prog)return ; -if (prog->clear_priv) - prog->clear_priv (prog, prog->priv); - - prog->priv =NULL ; - prog->clear_priv =NULL ; -bpf_program__unload (prog);zfree (&prog->name);zfree (&prog->sec_name);
@@ -8051,12 +8048,6 @@ static int bpf_program_unpin_instance(struct bpf_program *prog, const char *pathreturn 0 ; } -__attribute__((alias ("bpf_program_pin_instance" ))) -int bpf_object__pin_instance (struct bpf_program *prog,const char *path,int instance); - -__attribute__((alias ("bpf_program_unpin_instance" ))) -int bpf_program__unpin_instance (struct bpf_program *prog,const char *path,int instance); -int bpf_program__pin (struct bpf_program *prog,const char *path) {int i, err;
@@ -8492,11 +8483,6 @@ int bpf_object__pin(struct bpf_object *obj, const char *path)static void bpf_map__destroy (struct bpf_map *map) { -if (map->clear_priv) - map->clear_priv (map, map->priv); - map->priv =NULL ; - map->clear_priv =NULL ; -if (map->inner_map) {bpf_map__destroy (map->inner_map);zfree (&map->inner_map);
@@ -8532,9 +8518,6 @@ void bpf_object__close(struct bpf_object *obj)if (IS_ERR_OR_NULL (obj))return ; -if (obj->clear_priv) - obj->clear_priv (obj, obj->priv); -usdt_manager_free (obj->usdt_man); obj->usdt_man =NULL ;
@@ -8594,22 +8577,6 @@ int bpf_object__set_kversion(struct bpf_object *obj, __u32 kern_version)return 0 ; } -int bpf_object__set_priv (struct bpf_object *obj,void *priv, -bpf_object_clear_priv_t clear_priv) -{ -if (obj->priv && obj->clear_priv) - obj->clear_priv (obj, obj->priv); - - obj->priv = priv; - obj->clear_priv = clear_priv; -return 0 ; -} - -void *bpf_object__priv (const struct bpf_object *obj) -{ -return obj ? obj->priv :libbpf_err_ptr (-EINVAL ); -} -int bpf_object__gen_loader (struct bpf_object *obj,struct gen_loader_opts *opts) {struct bpf_gen *gen;
@@ -8676,22 +8643,6 @@ bpf_object__prev_program(const struct bpf_object *obj, struct bpf_program *next)return prog; } -int bpf_program__set_priv (struct bpf_program *prog,void *priv, -bpf_program_clear_priv_t clear_priv) -{ -if (prog->priv && prog->clear_priv) - prog->clear_priv (prog, prog->priv); - - prog->priv = priv; - prog->clear_priv = clear_priv; -return 0 ; -} - -void *bpf_program__priv (const struct bpf_program *prog) -{ -return prog ? prog->priv :libbpf_err_ptr (-EINVAL ); -} -void bpf_program__set_ifindex (struct bpf_program *prog,__u32 ifindex) { prog->prog_ifindex = ifindex;
@@ -8758,37 +8709,6 @@ int bpf_program__set_insns(struct bpf_program *prog,return 0 ; } -int bpf_program__set_prep (struct bpf_program *prog,int nr_instances, -bpf_program_prep_t prep) -{ -int *instances_fds; - -if (nr_instances <=0 || !prep) -return libbpf_err (-EINVAL ); - -if (prog->instances.nr >0 || prog->instances.fds) { -pr_warn ("Can't set pre-processor after loading\n" ); -return libbpf_err (-EINVAL ); - } - - instances_fds =malloc (sizeof (int ) * nr_instances); -if (!instances_fds) { -pr_warn ("alloc memory failed for fds\n" ); -return libbpf_err (-ENOMEM ); - } - -/* fill all fd with -1 */ -memset (instances_fds,-1 ,sizeof (int ) * nr_instances); - - prog->instances.nr = nr_instances; - prog->instances.fds = instances_fds; - prog->preprocessor = prep; -return 0 ; -} - -__attribute__((alias ("bpf_program_nth_fd" ))) -int bpf_program__nth_fd (const struct bpf_program *prog,int n); -static int bpf_program_nth_fd (const struct bpf_program *prog,int n) {int fd;
@@ -9716,27 +9636,6 @@ __u32 bpf_map__btf_value_type_id(const struct bpf_map *map)return map ? map->btf_value_type_id :0 ; } -int bpf_map__set_priv (struct bpf_map *map,void *priv, -bpf_map_clear_priv_t clear_priv) -{ -if (!map) -return libbpf_err (-EINVAL ); - -if (map->priv) { -if (map->clear_priv) - map->clear_priv (map, map->priv); - } - - map->priv = priv; - map->clear_priv = clear_priv; -return 0 ; -} - -void *bpf_map__priv (const struct bpf_map *map) -{ -return map ? map->priv :libbpf_err_ptr (-EINVAL ); -} -int bpf_map__set_initial_value (struct bpf_map *map,const void *data,size_t size) {
tools/lib/bpf/libbpf.h +0 -91
121 lines not on this page · raw message
tools/lib/bpf/libbpf.map +0 -10
@@ -6,11 +6,9 @@ LIBBPF_0.0.1 { bpf_map__fd; bpf_map__name; bpf_map__pin; - bpf_map__priv; bpf_map__reuse_fd; bpf_map__set_ifindex; bpf_map__set_inner_map_fd; - bpf_map__set_priv; bpf_map__unpin; bpf_map_delete_elem; bpf_map_get_fd_by_id;
@@ -32,8 +30,6 @@ LIBBPF_0.0.1 { bpf_object__pin; bpf_object__pin_maps; bpf_object__pin_programs; - bpf_object__priv; - bpf_object__set_priv; bpf_object__unpin_maps; bpf_object__unpin_programs; bpf_prog_attach;
@@ -43,18 +39,12 @@ LIBBPF_0.0.1 { bpf_prog_get_next_id; bpf_prog_query; bpf_program__fd; - bpf_program__nth_fd; bpf_program__pin; - bpf_program__pin_instance; - bpf_program__priv; bpf_program__set_expected_attach_type; bpf_program__set_ifindex; - bpf_program__set_prep; - bpf_program__set_priv; bpf_program__set_type; bpf_program__unload; bpf_program__unpin; - bpf_program__unpin_instance; bpf_prog_linfo__free; bpf_prog_linfo__new; bpf_prog_linfo__lfind_addr_func;
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 10/15 libbpf: cleanup LIBBPF_DEPRECATED_SINCE supporting macros for v0.x
In reply to Andrii NakryikoKeep the LIBBPF_DEPRECATED_SINCE macro "framework" for future deprecations, but clean up 0.x related helper macros.
--- tools/lib/bpf/libbpf_common.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
tools/lib/bpf/libbpf_common.h +3 -13
@@ -30,20 +30,10 @@/* Add checks for other versions below when planning deprecation of API symbols * with the LIBBPF_DEPRECATED_SINCE macro. */ -#if __LIBBPF_CURRENT_VERSION_GEQ (0 ,6 ) -#define __LIBBPF_MARK_DEPRECATED_0_6 (X ) X +#if __LIBBPF_CURRENT_VERSION_GEQ (1 ,0 ) +#define __LIBBPF_MARK_DEPRECATED_1_0 (X ) X#else -#define __LIBBPF_MARK_DEPRECATED_0_6 (X ) -#endif -#if __LIBBPF_CURRENT_VERSION_GEQ (0 ,7 ) -#define __LIBBPF_MARK_DEPRECATED_0_7 (X ) X -#else -#define __LIBBPF_MARK_DEPRECATED_0_7 (X ) -#endif -#if __LIBBPF_CURRENT_VERSION_GEQ (0 ,8 ) -#define __LIBBPF_MARK_DEPRECATED_0_8 (X ) X -#else -#define __LIBBPF_MARK_DEPRECATED_0_8 (X ) +#define __LIBBPF_MARK_DEPRECATED_1_0 (X )#endif /* This set of internal macros allows to do "function overloading" based on
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 11/15 libbpf: remove internal multi-instance prog support
In reply to Andrii NakryikoClean up internals that had to deal with the possibility of multi-instance bpf_programs. Libbpf 1.0 doesn't support this, so all this is not necessary now and can be simplified.
--- tools/lib/bpf/libbpf.c | 317 +++++------------------------------------ 1 file changed, 34 insertions(+), 283 deletions(-)
tools/lib/bpf/libbpf.c +34 -283
@@ -366,16 +366,6 @@ struct bpf_sec_def {libbpf_prog_attach_fn_t prog_attach_fn; }; -struct bpf_prog_prep_result { -struct bpf_insn *new_insn_ptr; -int new_insn_cnt; -int *pfd; -}; - -typedef int (*bpf_program_prep_t )(struct bpf_program *prog,int n, -struct bpf_insn *insns,int insns_cnt, -struct bpf_prog_prep_result *res); -/* * bpf_prog should be a better name but it has been used in * linux/filter.h.
@@ -429,22 +419,19 @@ struct bpf_program {size_t log_size;__u32 log_level; -struct { -int nr; -int *fds; - } instances; -bpf_program_prep_t preprocessor; -struct bpf_object *obj; +int fd;bool autoload;bool mark_btf_static;enum bpf_prog_type type;enum bpf_attach_type expected_attach_type; +int prog_ifindex;__u32 attach_btf_obj_fd;__u32 attach_btf_id;__u32 attach_prog_fd; +void *func_info;__u32 func_info_rec_size;__u32 func_info_cnt;
@@ -695,25 +682,10 @@ static Elf64_Rel *elf_rel_by_idx(Elf_Data *data, size_t idx);void bpf_program__unload (struct bpf_program *prog) { -int i; -if (!prog)return ; -/* -* If the object is opened but the program was never loaded, -* it is possible that prog->instances.nr == -1. -*/ -if (prog->instances.nr >0 ) { -for (i =0 ; i < prog->instances.nr; i++) -zclose (prog->instances.fds[i]); - }else if (prog->instances.nr !=-1 ) { -pr_warn ("Internal error: instances.nr is %d\n" , - prog->instances.nr); - } - - prog->instances.nr =-1 ; -zfree (&prog->instances.fds); +zclose (prog->fd);zfree (&prog->func_info);zfree (&prog->line_info);
@@ -797,6 +769,7 @@ bpf_object__init_prog(struct bpf_object *obj, struct bpf_program *prog, prog->insns_cnt = prog->sec_insn_cnt; prog->type =BPF_PROG_TYPE_UNSPEC ; + prog->fd =-1 ;/* libbpf's convention for SEC("?abc...") is that it's just like * SEC("abc...") but the corresponding bpf_program starts out with
@@ -810,9 +783,6 @@ bpf_object__init_prog(struct bpf_object *obj, struct bpf_program *prog, prog->autoload = true; } - prog->instances.fds =NULL ; - prog->instances.nr =-1 ; -/* inherit object's log_level */ prog->log_level = obj->log_level;
@@ -6862,10 +6832,9 @@ static int libbpf_prepare_prog_load(struct bpf_program *prog,static void fixup_verifier_log (struct bpf_program *prog,char *buf,size_t buf_sz); -static int bpf_object_load_prog_instance (struct bpf_object *obj,struct bpf_program *prog, -struct bpf_insn *insns,int insns_cnt, -const char *license,__u32 kern_version, -int *prog_fd) +static int bpf_object_load_prog (struct bpf_object *obj,struct bpf_program *prog, +struct bpf_insn *insns,int insns_cnt, +const char *license,__u32 kern_version,int *prog_fd) {LIBBPF_OPTS (bpf_prog_load_opts, load_attr);const char *prog_name =NULL ;
@@ -7232,88 +7201,6 @@ static int bpf_program_record_relos(struct bpf_program *prog)return 0 ; } -static int bpf_object_load_prog (struct bpf_object *obj,struct bpf_program *prog, -const char *license,__u32 kern_ver) -{ -int err =0 , fd, i; - -if (obj->loaded) { -pr_warn ("prog '%s': can't load after object was loaded\n" , prog->name); -return libbpf_err (-EINVAL ); - } - -if (prog->instances.nr <0 || !prog->instances.fds) { -if (prog->preprocessor) { -pr_warn ("Internal error: can't load program '%s'\n" , - prog->name); -return libbpf_err (-LIBBPF_ERRNO__INTERNAL ); - } - - prog->instances.fds =malloc (sizeof (int )); -if (!prog->instances.fds) { -pr_warn ("Not enough memory for BPF fds\n" ); -return libbpf_err (-ENOMEM ); - } - prog->instances.nr =1 ; - prog->instances.fds[0 ] =-1 ; - } - -if (!prog->preprocessor) { -if (prog->instances.nr !=1 ) { -pr_warn ("prog '%s': inconsistent nr(%d) != 1\n" , - prog->name, prog->instances.nr); - } -if (obj->gen_loader) -bpf_program_record_relos (prog); - err =bpf_object_load_prog_instance (obj, prog, - prog->insns, prog->insns_cnt, - license, kern_ver, &fd); -if (!err) - prog->instances.fds[0 ] = fd; - goto out; - } - -for (i =0 ; i < prog->instances.nr; i++) { -struct bpf_prog_prep_result result; -bpf_program_prep_t preprocessor = prog->preprocessor; - -memset (&result,0 ,sizeof (result)); - err =preprocessor (prog, i, prog->insns, - prog->insns_cnt, &result); -if (err) { -pr_warn ("Preprocessing the %dth instance of program '%s' failed\n" , - i, prog->name); - goto out; - } - -if (!result.new_insn_ptr || !result.new_insn_cnt) { -pr_debug ("Skip loading the %dth instance of program '%s'\n" , - i, prog->name); - prog->instances.fds[i] =-1 ; -if (result.pfd) - *result.pfd =-1 ; -continue ; - } - - err =bpf_object_load_prog_instance (obj, prog, - result.new_insn_ptr, result.new_insn_cnt, - license, kern_ver, &fd); -if (err) { -pr_warn ("Loading the %dth instance of program '%s' failed\n" , - i, prog->name); - goto out; - } - -if (result.pfd) - *result.pfd = fd; - prog->instances.fds[i] = fd; - } -out: -if (err) -pr_warn ("failed to load program '%s'\n" , prog->name); -return libbpf_err (err); -} -static int bpf_object__load_progs (struct bpf_object *obj,int log_level) {
@@ -7337,9 +7224,16 @@ bpf_object__load_progs(struct bpf_object *obj, int log_level)continue ; } prog->log_level |= log_level; - err =bpf_object_load_prog (obj, prog, obj->license, obj->kern_version); -if (err) + +if (obj->gen_loader) +bpf_program_record_relos (prog); + + err =bpf_object_load_prog (obj, prog, prog->insns, prog->insns_cnt, + obj->license, obj->kern_version, &prog->fd); +if (err) { +pr_warn ("prog '%s': failed to load: %d\n" , prog->name, err);return err; + } }bpf_object__free_relocs (obj);
@@ -7985,11 +7879,16 @@ static int check_path(const char *path)return err; } -static int bpf_program_pin_instance (struct bpf_program *prog,const char *path,int instance) +int bpf_program__pin (struct bpf_program *prog,const char *path) {char *cp, errmsg[STRERR_BUFSIZE ];int err; +if (prog->fd <0 ) { +pr_warn ("prog '%s': can't pin program that wasn't loaded\n" , prog->name); +return libbpf_err (-EINVAL ); + } + err =make_parent_dir (path);if (err)return libbpf_err (err);
@@ -7998,164 +7897,35 @@ static int bpf_program_pin_instance(struct bpf_program *prog, const char *path,if (err)return libbpf_err (err); -if (prog ==NULL ) { -pr_warn ("invalid program pointer\n" ); -return libbpf_err (-EINVAL ); - } - -if (instance <0 || instance >= prog->instances.nr) { -pr_warn ("invalid prog instance %d of prog %s (max %d)\n" , - instance, prog->name, prog->instances.nr); -return libbpf_err (-EINVAL ); - } - -if (bpf_obj_pin (prog->instances.fds[instance], path)) { +if (bpf_obj_pin (prog->fd, path)) { err = -errno; cp =libbpf_strerror_r (err, errmsg,sizeof (errmsg)); -pr_warn ("failed to pin program: %s\n" , cp); +pr_warn ("prog '%s': failed to pin at '%s': %s\n" , prog->name, path, cp);return libbpf_err (err); } -pr_debug ("pinned program '%s'\n" , path); +pr_debug ("prog '%s': pinned at '%s'\n" , prog->name, path);return 0 ; } -static int bpf_program_unpin_instance (struct bpf_program *prog,const char *path,int instance) +int bpf_program__unpin (struct bpf_program *prog,const char *path) {int err; - err =check_path (path); -if (err) -return libbpf_err (err); - -if (prog ==NULL ) { -pr_warn ("invalid program pointer\n" ); +if (prog->fd <0 ) { +pr_warn ("prog '%s': can't unpin program that wasn't loaded\n" , prog->name);return libbpf_err (-EINVAL ); } -if (instance <0 || instance >= prog->instances.nr) { -pr_warn ("invalid prog instance %d of prog %s (max %d)\n" , - instance, prog->name, prog->instances.nr); -return libbpf_err (-EINVAL ); - } - - err =unlink (path); -if (err !=0 ) -return libbpf_err (-errno); - -pr_debug ("unpinned program '%s'\n" , path); - -return 0 ; -} - -int bpf_program__pin (struct bpf_program *prog,const char *path) -{ -int i, err; - - err =make_parent_dir (path); -if (err) -return libbpf_err (err); - - err =check_path (path); -if (err) -return libbpf_err (err); - -if (prog ==NULL ) { -pr_warn ("invalid program pointer\n" ); -return libbpf_err (-EINVAL ); - } - -if (prog->instances.nr <=0 ) { -pr_warn ("no instances of prog %s to pin\n" , prog->name); -return libbpf_err (-EINVAL ); - } - -if (prog->instances.nr ==1 ) { -/* don't create subdirs when pinning single instance */ -return bpf_program_pin_instance (prog, path,0 ); - } - -for (i =0 ; i < prog->instances.nr; i++) { -char buf[PATH_MAX ]; -int len; - - len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); -if (len <0 ) { - err = -EINVAL ; - goto err_unpin; - }else if (len >=PATH_MAX ) { - err = -ENAMETOOLONG ; - goto err_unpin; - } - - err =bpf_program_pin_instance (prog, buf, i); -if (err) - goto err_unpin; - } - -return 0 ; - -err_unpin: -for (i = i -1 ; i >=0 ; i--) { -char buf[PATH_MAX ]; -int len; - - len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); -if (len <0 ) -continue ; -else if (len >=PATH_MAX ) -continue ; - -bpf_program_unpin_instance (prog, buf, i); - } - -rmdir (path); - -return libbpf_err (err); -} - -int bpf_program__unpin (struct bpf_program *prog,const char *path) -{ -int i, err; - err =check_path (path);if (err)return libbpf_err (err); -if (prog ==NULL ) { -pr_warn ("invalid program pointer\n" ); -return libbpf_err (-EINVAL ); - } - -if (prog->instances.nr <=0 ) { -pr_warn ("no instances of prog %s to pin\n" , prog->name); -return libbpf_err (-EINVAL ); - } - -if (prog->instances.nr ==1 ) { -/* don't create subdirs when pinning single instance */ -return bpf_program_unpin_instance (prog, path,0 ); - } - -for (i =0 ; i < prog->instances.nr; i++) { -char buf[PATH_MAX ]; -int len; - - len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); -if (len <0 ) -return libbpf_err (-EINVAL ); -else if (len >=PATH_MAX ) -return libbpf_err (-ENAMETOOLONG ); - - err =bpf_program_unpin_instance (prog, buf, i); -if (err) -return err; - } - - err =rmdir (path); + err =unlink (path);if (err)return libbpf_err (-errno); +pr_debug ("prog '%s': unpinned from '%s'\n" , prog->name, path);return 0 ; }
@@ -8672,13 +8442,6 @@ int bpf_program__set_autoload(struct bpf_program *prog, bool autoload)return 0 ; } -static int bpf_program_nth_fd (const struct bpf_program *prog,int n); - -int bpf_program__fd (const struct bpf_program *prog) -{ -return bpf_program_nth_fd (prog,0 ); -} -const struct bpf_insn *bpf_program__insns (const struct bpf_program *prog) {return prog->insns;
@@ -8709,27 +8472,15 @@ int bpf_program__set_insns(struct bpf_program *prog,return 0 ; } -static int bpf_program_nth_fd (const struct bpf_program *prog,int n) +int bpf_program__fd (const struct bpf_program *prog) { -int fd; -if (!prog)return libbpf_err (-EINVAL ); -if (n >= prog->instances.nr || n <0 ) { -pr_warn ("Can't get the %dth fd from program %s: only %d instances\n" , - n, prog->name, prog->instances.nr); -return libbpf_err (-EINVAL ); - } - - fd = prog->instances.fds[n]; -if (fd <0 ) { -pr_warn ("%dth instance of program '%s' is invalid\n" , - n, prog->name); +if (prog->fd <0 )return libbpf_err (-ENOENT ); - } -return fd; +return prog->fd; }__alias (bpf_program__type)
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 12/15 libbpf: clean up SEC() handling
In reply to Andrii NakryikoGet rid of sloppy prefix logic and remove deprecated xdp_{devmap,cpumap} sections.
--- tools/lib/bpf/libbpf.c | 119 ++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 72 deletions(-)
tools/lib/bpf/libbpf.c +47 -72
@@ -346,12 +346,8 @@ enum sec_def_flags {SEC_ATTACH_BTF =4 ,/* BPF program type allows sleeping/blocking in kernel */ SEC_SLEEPABLE =8 , -/* allow non-strict prefix matching */ -SEC_SLOPPY_PFX =16 ,/* BPF program support non-linear XDP buffer */ -SEC_XDP_FRAGS =32 , -/* deprecated sec definitions not supposed to be used */ - SEC_DEPRECATED = 64, + SEC_XDP_FRAGS = 16, }; struct bpf_sec_def {
@@ -6785,11 +6781,6 @@ static int libbpf_prepare_prog_load(struct bpf_program *prog,if (prog->type ==BPF_PROG_TYPE_XDP && (def &SEC_XDP_FRAGS )) opts->prog_flags |=BPF_F_XDP_HAS_FRAGS ; -if (def &SEC_DEPRECATED ) { -pr_warn ("SEC(\"%s\") is deprecated, please see https://github.com/libbpf/libbpf/wiki/Libbpf-1.0-migration-guide#bpf-program-sec-annotation-deprecations for details\n" , - prog->sec_name); - } -if ((def &SEC_ATTACH_BTF ) && !prog->attach_btf_id) {int btf_obj_fd =0 , btf_type_id =0 , err;const char *attach_name;
@@ -8586,9 +8577,9 @@ static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_listatic int attach_iter (const struct bpf_program *prog,long cookie,struct bpf_link **link);static const struct bpf_sec_def section_defs[] = { -SEC_DEF ("socket" ,SOCKET_FILTER ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_reuseport/migrate" ,SK_REUSEPORT ,BPF_SK_REUSEPORT_SELECT_OR_MIGRATE ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_reuseport" ,SK_REUSEPORT ,BPF_SK_REUSEPORT_SELECT ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), +SEC_DEF ("socket" ,SOCKET_FILTER ,0 ,SEC_NONE ), +SEC_DEF ("sk_reuseport/migrate" ,SK_REUSEPORT ,BPF_SK_REUSEPORT_SELECT_OR_MIGRATE ,SEC_ATTACHABLE ), +SEC_DEF ("sk_reuseport" ,SK_REUSEPORT ,BPF_SK_REUSEPORT_SELECT ,SEC_ATTACHABLE ),SEC_DEF ("kprobe+" ,KPROBE ,0 ,SEC_NONE , attach_kprobe),SEC_DEF ("uprobe+" ,KPROBE ,0 ,SEC_NONE , attach_uprobe),SEC_DEF ("uprobe.s+" ,KPROBE ,0 ,SEC_SLEEPABLE , attach_uprobe),
@@ -8599,8 +8590,8 @@ static const struct bpf_sec_def section_defs[] = {SEC_DEF ("kretprobe.multi+" ,KPROBE ,BPF_TRACE_KPROBE_MULTI ,SEC_NONE , attach_kprobe_multi),SEC_DEF ("usdt+" ,KPROBE ,0 ,SEC_NONE , attach_usdt),SEC_DEF ("tc" ,SCHED_CLS ,0 ,SEC_NONE ), -SEC_DEF ("classifier" ,SCHED_CLS ,0 ,SEC_NONE |SEC_SLOPPY_PFX |SEC_DEPRECATED ), -SEC_DEF ("action" ,SCHED_ACT ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), +SEC_DEF ("classifier" ,SCHED_CLS ,0 ,SEC_NONE ), +SEC_DEF ("action" ,SCHED_ACT ,0 ,SEC_NONE ),SEC_DEF ("tracepoint+" ,TRACEPOINT ,0 ,SEC_NONE , attach_tp),SEC_DEF ("tp+" ,TRACEPOINT ,0 ,SEC_NONE , attach_tp), SEC_DEF("raw_tracepoint+", RAW_TRACEPOINT, 0, SEC_NONE, attach_raw_tp),
@@ -8622,50 +8613,48 @@ static const struct bpf_sec_def section_defs[] = {SEC_DEF ("syscall" ,SYSCALL ,0 ,SEC_SLEEPABLE ),SEC_DEF ("xdp.frags/devmap" ,XDP ,BPF_XDP_DEVMAP ,SEC_XDP_FRAGS ),SEC_DEF ("xdp/devmap" ,XDP ,BPF_XDP_DEVMAP ,SEC_ATTACHABLE ), -SEC_DEF ("xdp_devmap/" ,XDP ,BPF_XDP_DEVMAP ,SEC_ATTACHABLE |SEC_DEPRECATED ),SEC_DEF ("xdp.frags/cpumap" ,XDP ,BPF_XDP_CPUMAP ,SEC_XDP_FRAGS ),SEC_DEF ("xdp/cpumap" ,XDP ,BPF_XDP_CPUMAP ,SEC_ATTACHABLE ), -SEC_DEF ("xdp_cpumap/" ,XDP ,BPF_XDP_CPUMAP ,SEC_ATTACHABLE |SEC_DEPRECATED ),SEC_DEF ("xdp.frags" ,XDP ,BPF_XDP ,SEC_XDP_FRAGS ), -SEC_DEF ("xdp" ,XDP ,BPF_XDP ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("perf_event" ,PERF_EVENT ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("lwt_in" ,LWT_IN ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("lwt_out" ,LWT_OUT ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("lwt_xmit" ,LWT_XMIT ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("lwt_seg6local" ,LWT_SEG6LOCAL ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup_skb/ingress" ,CGROUP_SKB ,BPF_CGROUP_INET_INGRESS ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup_skb/egress" ,CGROUP_SKB ,BPF_CGROUP_INET_EGRESS ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/skb" ,CGROUP_SKB ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sock_create" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_CREATE ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sock_release" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_RELEASE ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sock" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_CREATE ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/post_bind4" ,CGROUP_SOCK ,BPF_CGROUP_INET4_POST_BIND ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/post_bind6" ,CGROUP_SOCK ,BPF_CGROUP_INET6_POST_BIND ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/dev" ,CGROUP_DEVICE ,BPF_CGROUP_DEVICE ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("sockops" ,SOCK_OPS ,BPF_CGROUP_SOCK_OPS ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_skb/stream_parser" ,SK_SKB ,BPF_SK_SKB_STREAM_PARSER ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_skb/stream_verdict" ,SK_SKB ,BPF_SK_SKB_STREAM_VERDICT ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_skb" ,SK_SKB ,0 ,SEC_NONE |SEC_SLOPPY_PFX ), -SEC_DEF ("sk_msg" ,SK_MSG ,BPF_SK_MSG_VERDICT ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("lirc_mode2" ,LIRC_MODE2 ,BPF_LIRC_MODE2 ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("flow_dissector" ,FLOW_DISSECTOR ,BPF_FLOW_DISSECTOR ,SEC_ATTACHABLE_OPT |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/bind4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_BIND ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/bind6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_BIND ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/connect4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_CONNECT ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/connect6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_CONNECT ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sendmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_SENDMSG ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sendmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_SENDMSG ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/recvmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_RECVMSG ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/recvmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_RECVMSG ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/getpeername4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETPEERNAME ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/getpeername6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETPEERNAME ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/getsockname4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETSOCKNAME ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/getsockname6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETSOCKNAME ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/sysctl" ,CGROUP_SYSCTL ,BPF_CGROUP_SYSCTL ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/getsockopt" ,CGROUP_SOCKOPT ,BPF_CGROUP_GETSOCKOPT ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), -SEC_DEF ("cgroup/setsockopt" ,CGROUP_SOCKOPT ,BPF_CGROUP_SETSOCKOPT ,SEC_ATTACHABLE |SEC_SLOPPY_PFX ), +SEC_DEF ("xdp" ,XDP ,BPF_XDP ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("perf_event" ,PERF_EVENT ,0 ,SEC_NONE ), +SEC_DEF ("lwt_in" ,LWT_IN ,0 ,SEC_NONE ), +SEC_DEF ("lwt_out" ,LWT_OUT ,0 ,SEC_NONE ), +SEC_DEF ("lwt_xmit" ,LWT_XMIT ,0 ,SEC_NONE ), +SEC_DEF ("lwt_seg6local" ,LWT_SEG6LOCAL ,0 ,SEC_NONE ), +SEC_DEF ("sockops" ,SOCK_OPS ,BPF_CGROUP_SOCK_OPS ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("sk_skb/stream_parser" ,SK_SKB ,BPF_SK_SKB_STREAM_PARSER ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("sk_skb/stream_verdict" ,SK_SKB ,BPF_SK_SKB_STREAM_VERDICT ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("sk_skb" ,SK_SKB ,0 ,SEC_NONE ), +SEC_DEF ("sk_msg" ,SK_MSG ,BPF_SK_MSG_VERDICT ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("lirc_mode2" ,LIRC_MODE2 ,BPF_LIRC_MODE2 ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("flow_dissector" ,FLOW_DISSECTOR ,BPF_FLOW_DISSECTOR ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("cgroup_skb/ingress" ,CGROUP_SKB ,BPF_CGROUP_INET_INGRESS ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("cgroup_skb/egress" ,CGROUP_SKB ,BPF_CGROUP_INET_EGRESS ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("cgroup/skb" ,CGROUP_SKB ,0 ,SEC_NONE ), +SEC_DEF ("cgroup/sock_create" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_CREATE ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sock_release" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_RELEASE ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sock" ,CGROUP_SOCK ,BPF_CGROUP_INET_SOCK_CREATE ,SEC_ATTACHABLE_OPT ), +SEC_DEF ("cgroup/post_bind4" ,CGROUP_SOCK ,BPF_CGROUP_INET4_POST_BIND ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/post_bind6" ,CGROUP_SOCK ,BPF_CGROUP_INET6_POST_BIND ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/bind4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_BIND ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/bind6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_BIND ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/connect4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_CONNECT ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/connect6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_CONNECT ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sendmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_SENDMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sendmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_SENDMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/recvmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_RECVMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/recvmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_RECVMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getpeername4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETPEERNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getpeername6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETPEERNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getsockname4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETSOCKNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getsockname6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETSOCKNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sysctl" ,CGROUP_SYSCTL ,BPF_CGROUP_SYSCTL ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getsockopt" ,CGROUP_SOCKOPT ,BPF_CGROUP_GETSOCKOPT ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/setsockopt" ,CGROUP_SOCKOPT ,BPF_CGROUP_SETSOCKOPT ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/dev" ,CGROUP_DEVICE ,BPF_CGROUP_DEVICE ,SEC_ATTACHABLE_OPT ),SEC_DEF ("struct_ops+" ,STRUCT_OPS ,0 ,SEC_NONE ), - SEC_DEF("sk_lookup", SK_LOOKUP, BPF_SK_LOOKUP, SEC_ATTACHABLE | SEC_SLOPPY_PFX), + SEC_DEF("sk_lookup", SK_LOOKUP, BPF_SK_LOOKUP, SEC_ATTACHABLE), };static size_t custom_sec_def_cnt;
@@ -8760,8 +8749,7 @@ int libbpf_unregister_prog_handler(int handler_id)return 0 ; } -static bool sec_def_matches (const struct bpf_sec_def *sec_def,const char *sec_name, -bool allow_sloppy) +static bool sec_def_matches (const struct bpf_sec_def *sec_def,const char *sec_name) {size_t len =strlen (sec_def->sec);
@@ -8786,17 +8774,6 @@ static bool sec_def_matches(const struct bpf_sec_def *sec_def, const char *sec_nreturn false; } -/* SEC_SLOPPY_PFX definitions are allowed to be just prefix -* matches, unless strict section name mode -* (LIBBPF_STRICT_SEC_NAME) is enabled, in which case the -* match has to be exact. -*/ -if (allow_sloppy &&str_has_pfx (sec_name, sec_def->sec)) -return true; - -/* Definitions not marked SEC_SLOPPY_PFX (e.g., -* SEC("syscall")) are exact matches in both modes. -*/ return strcmp (sec_name, sec_def->sec) ==0 ; }
@@ -8804,20 +8781,18 @@ static const struct bpf_sec_def *find_sec_def(const char *sec_name) {const struct bpf_sec_def *sec_def;int i, n; -bool strict = libbpf_mode &LIBBPF_STRICT_SEC_NAME , allow_sloppy; n = custom_sec_def_cnt;for (i =0 ; i < n; i++) { sec_def = &custom_sec_defs[i]; -if (sec_def_matches (sec_def, sec_name, false)) +if (sec_def_matches (sec_def, sec_name))return sec_def; } n =ARRAY_SIZE (section_defs);for (i =0 ; i < n; i++) { sec_def = §ion_defs[i]; - allow_sloppy = (sec_def->cookie &SEC_SLOPPY_PFX ) && !strict; -if (sec_def_matches (sec_def, sec_name, allow_sloppy)) +if (sec_def_matches (sec_def, sec_name))return sec_def; }
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 13/15 selftests/bpf: remove last tests with legacy BPF map definitions
In reply to Andrii NakryikoLibbpf 1.0 stops support legacy-style BPF map definitions. Selftests has been migrated away from using legacy BPF map definitions except for two selftests, to make sure that legacy functionality still worked in pre-1.0 libbpf. Now it's time to let those tests go as libbpf 1.0 is imminent.
--- tools/testing/selftests/bpf/bpf_legacy.h | 9 ---- tools/testing/selftests/bpf/prog_tests/btf.c | 1 - .../selftests/bpf/progs/test_btf_haskv.c | 51 ------------------- .../selftests/bpf/progs/test_btf_newkv.c | 18 ------- 4 files changed, 79 deletions(-) delete mode 100644 tools/testing/selftests/bpf/progs/test_btf_haskv.c
tools/testing/selftests/bpf/bpf_legacy.h +0 -9
@@ -2,15 +2,6 @@#ifndef __BPF_LEGACY__#define __BPF_LEGACY__ -#define BPF_ANNOTATE_KV_PAIR (name, type_key, type_val) \ - struct ____btf_map_##name { \ - type_key key; \ - type_val value; \ - }; \ - struct ____btf_map_##name \ - __attribute__ ((section(".maps." #name), used)) \ - ____btf_map_##name = { } -/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions */
tools/testing/selftests/bpf/prog_tests/btf.c +0 -1
@@ -4651,7 +4651,6 @@ struct btf_file_test { };static struct btf_file_test file_tests[] = { - { .file ="test_btf_haskv.o" , }, { .file ="test_btf_newkv.o" , }, { .file ="test_btf_nokv.o" , .btf_kv_notfound = true, }, };
tools/testing/selftests/bpf/progs/test_btf_haskv.c deleted +0 -51
51 lines not on this page · raw message
tools/testing/selftests/bpf/progs/test_btf_newkv.c +0 -18
@@ -9,19 +9,6 @@ struct ipv_counts {unsigned int v6; }; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -/* just to validate we can handle maps in multiple sections */ -struct bpf_map_def SEC("maps") btf_map_legacy = { - .type = BPF_MAP_TYPE_ARRAY, - .key_size = sizeof(int), - .value_size = sizeof(long long), - .max_entries = 4, -}; -#pragma GCC diagnostic pop - -BPF_ANNOTATE_KV_PAIR(btf_map_legacy, int, struct ipv_counts); -struct { __uint(type, BPF_MAP_TYPE_ARRAY); __uint(max_entries, 4);
@@ -41,11 +28,6 @@ int test_long_fname_2(void) counts->v6++; -/* just verify we can reference both maps */ - counts =bpf_map_lookup_elem (&btf_map_legacy, &key); -if (!counts) -return 0 ; -return 0 ; }
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 14/15 libbpf: enforce strict libbpf 1.0 behaviors
In reply to Andrii NakryikoRemove support for legacy features and behaviors that previously had to be disabled by calling libbpf_set_strict_mode():
- legacy BPF map definitions are not supported now;
- RLIMIT_MEMLOCK auto-setting, if necessary, is always on (but see
libbpf_set_memlock_rlim());
- program name is used for program pinning (instead of section name);
- cleaned up error returning logic;
- entry BPF programs should have SEC() always.
--- tools/lib/bpf/bpf.c | 4 - tools/lib/bpf/libbpf.c | 212 ++------------------------------ tools/lib/bpf/libbpf.h | 34 ----- tools/lib/bpf/libbpf_internal.h | 24 +--- tools/lib/bpf/libbpf_legacy.h | 24 ++++ 5 files changed, 37 insertions(+), 261 deletions(-)
tools/lib/bpf/bpf.c +0 -4
@@ -147,10 +147,6 @@ int bump_rlimit_memlock(void) {struct rlimit rlim; -/* this the default in libbpf 1.0, but for now user has to opt-in explicitly */ -if (!(libbpf_mode &LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK )) -return 0 ; -/* if kernel supports memcg-based accounting, skip bumping RLIMIT_MEMLOCK */ if (memlock_bumped ||kernel_supports (NULL ,FEAT_MEMCG_ACCOUNT ))return 0 ;
tools/lib/bpf/libbpf.c +9 -203
292 lines not on this page · raw message
tools/lib/bpf/libbpf.h +0 -34
@@ -886,40 +886,6 @@ LIBBPF_API int bpf_map__lookup_and_delete_elem(const struct bpf_map *map, LIBBPF_API int bpf_map__get_next_key(const struct bpf_map *map,const void *cur_key,void *next_key,size_t key_sz); -/** -* @brief **libbpf_get_error()** extracts the error code from the passed -* pointer -* @param ptr pointer returned from libbpf API function -* @return error code; or 0 if no error occured -* -* Many libbpf API functions which return pointers have logic to encode error -* codes as pointers, and do not return NULL. Meaning **libbpf_get_error()** -* should be used on the return value from these functions immediately after -* calling the API function, with no intervening calls that could clobber the -* `errno` variable. Consult the individual functions documentation to verify -* if this logic applies should be used. -* -* For these API functions, if `libbpf_set_strict_mode(LIBBPF_STRICT_CLEAN_PTRS)` -* is enabled, NULL is returned on error instead. -* -* If ptr is NULL, then errno should be already set by the failing -* API, because libbpf never returns NULL on success and it now always -* sets errno on error. -* -* Example usage: -* -* struct perf_buffer *pb; -* -* pb = perf_buffer__new(bpf_map__fd(obj->maps.events), PERF_BUFFER_PAGES, &opts); -* err = libbpf_get_error(pb); -* if (err) { -* pb = NULL; -* fprintf(stderr, "failed to open perf buffer: %d\n", err); -* goto cleanup; -* } -*/ -LIBBPF_API long libbpf_get_error (const void *ptr); -struct bpf_xdp_set_link_opts {size_t sz;int old_fd;
tools/lib/bpf/libbpf_internal.h +4 -20
@@ -15,7 +15,6 @@#include <linux/err.h> #include <fcntl.h> #include <unistd.h> -#include "libbpf_legacy.h" #include "relo_core.h" /* make sure libbpf doesn't use kernel-only integer typedefs */
@@ -478,8 +477,6 @@ int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit, void__s32 btf__find_by_name_kind_own (const struct btf *btf,const char *type_name,__u32 kind); -extern enum libbpf_strict_mode libbpf_mode; -typedef int (*kallsyms_cb_t )(unsigned long long sym_addr,char sym_type,const char *sym_name,void *ctx);
@@ -498,12 +495,8 @@ static inline int libbpf_err(int ret)*/ static inline int libbpf_err_errno (int ret) { -if (libbpf_mode &LIBBPF_STRICT_DIRECT_ERRS ) -/* errno is already assumed to be set on error */ -return ret <0 ? -errno : ret; - -/* legacy: on error return -1 directly and don't touch errno */ -return ret; +/* errno is already assumed to be set on error */ +return ret <0 ? -errno : ret; }/* handle error for pointer-returning APIs, err is assumed to be < 0 always */
@@ -511,12 +504,7 @@ static inline void *libbpf_err_ptr(int err) {/* set errno on error, this doesn't break anything */ errno = -err; - -if (libbpf_mode &LIBBPF_STRICT_CLEAN_PTRS ) -return NULL ; - -/* legacy: encode err as ptr */ -return ERR_PTR (err); +return NULL ; }/* handle pointer-returning APIs' error handling */
@@ -526,11 +514,7 @@ static inline void *libbpf_ptr(void *ret)if (IS_ERR (ret)) errno = -PTR_ERR (ret); -if (libbpf_mode &LIBBPF_STRICT_CLEAN_PTRS ) -return IS_ERR (ret) ?NULL : ret; - -/* legacy: pass-through original pointer */ -return ret; +return IS_ERR (ret) ?NULL : ret; }static inline bool str_is_empty (const char *s)
tools/lib/bpf/libbpf_legacy.h +24 -0
@@ -20,6 +20,11 @@ extern "C" { #endif +/* As of libbpf 1.0 libbpf_set_strict_mode() and enum libbpf_struct_mode have + * no effect. But they are left in libbpf_legacy.h so that applications that + * prepared for libbpf 1.0 before final release by using + * libbpf_set_strict_mode() still work with libbpf 1.0+ without any changes. + */ enum libbpf_strict_mode { /* Turn on all supported strict features of libbpf to simulate libbpf * v1.0 behavior.
@@ -88,6 +93,25 @@ enum libbpf_strict_mode { LIBBPF_API int libbpf_set_strict_mode(enum libbpf_strict_mode mode); +/** +* @brief **libbpf_get_error()** extracts the error code from the passed +* pointer +* @param ptr pointer returned from libbpf API function +* @return error code; or 0 if no error occured +* +* Note, as of libbpf 1.0 this function is not necessary and not recommended +* to be used. Libbpf doesn't return error code embedded into the pointer +* itself. Instead, NULL is returned on error and error code is passed through +* thread-local errno variable. **libbpf_get_error()** is just returning -errno +* value if it receives NULL, which is correct only if errno hasn't been +* modified between libbpf API call and corresponding **libbpf_get_error()** +* call. Prefer to check return for NULL and use errno directly. +* +* This API is left in libbpf 1.0 to allow applications that were 1.0-ready +* before final libbpf 1.0 without needing to change them. +*/ +LIBBPF_API long libbpf_get_error (const void *ptr); +#define DECLARE_LIBBPF_OPTS LIBBPF_OPTS/* "Discouraged" APIs which don't follow consistent libbpf naming patterns.
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH v2 15/15 libbpf: fix up few libbpf.map problems
In reply to Andrii NakryikoSeems like we missed to add 2 APIs to libbpf.map and another API was misspelled. Fix it in libbpf.map.
--- tools/lib/bpf/libbpf.map | 3 ++- tools/lib/bpf/libbpf_legacy.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.map +2 -1
@@ -326,10 +326,11 @@ LIBBPF_0.7.0 { bpf_xdp_detach; bpf_xdp_query; bpf_xdp_query_id; + btf_ext__raw_data; libbpf_probe_bpf_helper; libbpf_probe_bpf_map_type; libbpf_probe_bpf_prog_type; - libbpf_set_memlock_rlim_max; + libbpf_set_memlock_rlim; } LIBBPF_0.6.0; LIBBPF_0.8.0 {
tools/lib/bpf/libbpf_legacy.h +2 -2
@@ -76,8 +76,8 @@ enum libbpf_strict_mode {* first BPF program or map creation operation. This is done only if * kernel is too old to support memcg-based memory accounting for BPF * subsystem. By default, RLIMIT_MEMLOCK limit is set to RLIM_INFINITY, -* but it can be overriden with libbpf_set_memlock_rlim_max() API. -* Note that libbpf_set_memlock_rlim_max() needs to be called before +* but it can be overriden with libbpf_set_memlock_rlim() API. +* Note that libbpf_set_memlock_rlim() needs to be called before * the very first bpf_prog_load(), bpf_map_create() or bpf_object__load() * operation. */
Signature · 1 line
2.30.2
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Mon, 27 Jun 2022 14:15:12 -0700 you wrote:
This patch set removes all the deprecated APIs in preparation for 1.0 release. It also makes
libbpf_set_strict_mode()a no-op (but keeps it to let per-1.0 applications buildable and dynamically linkable against libbpf 1.0 if they were already libbpf-1.0 ready) and starts enforcing all the behaviors that were previously opt-in throughlibbpf_set_strict_mode().xsk.{c,h} parts that are now properly provided by libxdp ([0]) are still used by
xdpxceiver.cin selftest/bpf, so I've moved xsk.{c,h} with barely any changes to under selftests/bpf.[...]
Here is the summary with links:
- [v2,bpf-next,01/15] libbpf: move xsk.{c,h} into selftests/bpf
https://git.kernel.org/bpf/bpf-next/c/f36600634282 - [v2,bpf-next,02/15] libbpf: remove deprecated low-level APIs https://git.kernel.org/bpf/bpf-next/c/765a34130ea5 - [v2,bpf-next,03/15] libbpf: remove deprecated XDP APIs https://git.kernel.org/bpf/bpf-next/c/53e6af3a761c - [v2,bpf-next,04/15] libbpf: remove deprecated probing APIs https://git.kernel.org/bpf/bpf-next/c/d320fad217b7 - [v2,bpf-next,05/15] libbpf: remove deprecated BTF APIs https://git.kernel.org/bpf/bpf-next/c/aaf6886d9b53 - [v2,bpf-next,06/15] libbpf: clean up perfbuf APIs https://git.kernel.org/bpf/bpf-next/c/22dd7a58b2e9 - [v2,bpf-next,07/15] libbpf: remove prog_info_linear APIs https://git.kernel.org/bpf/bpf-next/c/9a590538ba4f - [v2,bpf-next,08/15] libbpf: remove most other deprecated high-level APIs https://git.kernel.org/bpf/bpf-next/c/146bf811f5ac - [v2,bpf-next,09/15] libbpf: remove multi-instance and custom private data APIs https://git.kernel.org/bpf/bpf-next/c/b4bda502dfa2 - [v2,bpf-next,10/15] libbpf: cleanup LIBBPF_DEPRECATED_SINCE supporting macros for v0.x https://git.kernel.org/bpf/bpf-next/c/a11113a2dcbe - [v2,bpf-next,11/15] libbpf: remove internal multi-instance prog support https://git.kernel.org/bpf/bpf-next/c/cf90a20db878 - [v2,bpf-next,12/15] libbpf: clean up SEC() handling https://git.kernel.org/bpf/bpf-next/c/450b167fb9be - [v2,bpf-next,13/15] selftests/bpf: remove last tests with legacy BPF map definitions https://git.kernel.org/bpf/bpf-next/c/31e42721976b - [v2,bpf-next,14/15] libbpf: enforce strict libbpf 1.0 behaviors https://git.kernel.org/bpf/bpf-next/c/bd054102a8c7 - [v2,bpf-next,15/15] libbpf: fix up few libbpf.map problems https://git.kernel.org/bpf/bpf-next/c/ab9a5a05dc48
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html