bpftool: allow compile-time checks of BPF map auto-attach support in skeleton
Andrii Nakryiko
maintainerPATCH 1/1 bpftool: allow compile-time checks of BPF map auto-attach support in skeleton
New versions of bpftool now emit additional link placeholders for BPF maps (struct_ops maps are the only maps right now that support attachment), and set up BPF skeleton in such a way that libbpf will auto-attach BPF maps automatically, assumming libbpf is recent enough (v1.5+). Old libbpf will do nothing with those links and won't attempt to auto-attach maps. This allows user code to handle both pre-v1.5 and v1.5+ versions of libbpf at runtime, if necessary.
But if users don't have (or don't want to) control bpftool version that generates skeleton, then they can't just assume that skeleton will have link placeholders. To make this detection possible and easy, let's add the following to generated skeleton header file:
#define BPF_SKEL_SUPPORTS_MAP_AUTO_ATTACH 1
This can be used during compilation time to guard code that accesses skel->links.<map> slots.
Note, if auto-attachment is undesirable, libbpf allows to disable this through bpf_map__set_autoattach(map, false). This is necessary only on libbpf v1.5+, older libbpf doesn't support map auto-attach anyways.
Libbpf version can be detected at compilation time using LIBBPF_MAJOR_VERSION and LIBBPF_MINOR_VERSION macros, or at runtime with libbpf_major_version() and libbpf_minor_version() APIs.
--- tools/bpf/bpftool/gen.c | 2 ++ 1 file changed, 2 insertions(+)
tools/bpf/bpftool/gen.c +2 -0
@@ -1272,6 +1272,8 @@ static int do_skeleton(int argc, char **argv) #include <stdlib.h> \n\ #include <bpf/libbpf.h> \n\ \n\ +#define BPF_SKEL_SUPPORTS_MAP_AUTO_ATTACH 1 \n\ + \n\ struct %1$s { \n\ struct bpf_object_skeleton *skeleton; \n\ struct bpf_object *obj; \n\
Signature · 1 line
2.43.0
Quoted 22 lines · Andrii Nakryiko
New versions of bpftool now emit additional link placeholders for BPF maps (
struct_opsmaps are the only maps right now that support attachment), and set up BPF skeleton in such a way that libbpf will auto-attach BPF maps automatically, assumming libbpf is recent enough (v1.5+). Old libbpf will do nothing with those links and won't attempt to auto-attach maps. This allows user code to handle both pre-v1.5 and v1.5+ versions of libbpf at runtime, if necessary.But if users don't have (or don't want to) control bpftool version that generates skeleton, then they can't just assume that skeleton will have link placeholders. To make this detection possible and easy, let's add the following to generated skeleton header file:
#define BPF_SKEL_SUPPORTS_MAP_AUTO_ATTACH 1This can be used during compilation time to guard code that accesses skel->links.<map> slots.
Note, if auto-attachment is undesirable, libbpf allows to disable this through
bpf_map__set_autoattach(map, false). This is necessary only on libbpf v1.5+, older libbpf doesn't support map auto-attach anyways.
Quoted 5 lines
Libbpf version can be detected at compilation time using
LIBBPF_MAJOR_VERSIONandLIBBPF_MINOR_VERSIONmacros, or at runtime withlibbpf_major_version()andlibbpf_minor_version()APIs.Signed-off-by Andrii Nakryiko <[email protected]>
Looks good, thanks.
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Tue, 18 Jun 2024 11:38:32 -0700 you wrote:
New versions of bpftool now emit additional link placeholders for BPF maps (
struct_opsmaps are the only maps right now that support attachment), and set up BPF skeleton in such a way that libbpf will auto-attach BPF maps automatically, assumming libbpf is recent enough (v1.5+). Old libbpf will do nothing with those links and won't attempt to auto-attach maps. This allows user code to handle both pre-v1.5 and v1.5+ versions of libbpf at runtime, if necessary.[...]
Here is the summary with links:
- [bpf-next] bpftool: allow compile-time checks of BPF map auto-attach support in skeleton
https://git.kernel.org/bpf/bpf-next/c/651337c7ca82
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html