libbpf: Add bpf_token_create() API

Add low-level wrapper API for BPF_TOKEN_CREATE command in bpf() syscall.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20240124022127.2379740-13-andrii@kernel.org

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index b133acfe08fbfb0ed36ff825082c195513d8b0b3..54978198147c2a8e1297b253314c387b79bcc0d1 100644 (file)
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -1289,3 +1289,20 @@ int bpf_prog_bind_map(int prog_fd, int map_fd,
        ret = sys_bpf(BPF_PROG_BIND_MAP, &attr, attr_sz);
        return libbpf_err_errno(ret);
 }
+
+int bpf_token_create(int bpffs_fd, struct bpf_token_create_opts *opts)
+{
+       const size_t attr_sz = offsetofend(union bpf_attr, token_create);
+       union bpf_attr attr;
+       int fd;
+
+       if (!OPTS_VALID(opts, bpf_token_create_opts))
+               return libbpf_err(-EINVAL);
+
+       memset(&attr, 0, attr_sz);
+       attr.token_create.bpffs_fd = bpffs_fd;
+       attr.token_create.flags = OPTS_GET(opts, flags, 0);
+
+       fd = sys_bpf_fd(BPF_TOKEN_CREATE, &attr, attr_sz);
+       return libbpf_err_errno(fd);
+}

diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 53b0bee053ad21e58e16b3e5c5cc0ab4140b3daa..0a9f456698fec5e2b6c45f6cadd67b929b94d91f 100644 (file)
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -642,6 +642,30 @@ struct bpf_test_run_opts {
 LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
                                      struct bpf_test_run_opts *opts);
 
+struct bpf_token_create_opts {
+       size_t sz; /* size of this struct for forward/backward compatibility */
+       __u32 flags;
+       size_t :0;
+};
+#define bpf_token_create_opts__last_field flags
+
+/**
+ * @brief **bpf_token_create()** creates a new instance of BPF token derived
+ * from specified BPF FS mount point.
+ *
+ * BPF token created with this API can be passed to bpf() syscall for
+ * commands like BPF_PROG_LOAD, BPF_MAP_CREATE, etc.
+ *
+ * @param bpffs_fd FD for BPF FS instance from which to derive a BPF token
+ * instance.
+ * @param opts optional BPF token creation options, can be NULL
+ *
+ * @return BPF token FD > 0, on success; negative error code, otherwise (errno
+ * is also set to the error code)
+ */
+LIBBPF_API int bpf_token_create(int bpffs_fd,
+                               struct bpf_token_create_opts *opts);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 91c5aef7dae7de4fb69e5e57b06cd7ed545be843..d9e1f57534fa7fb7dde853f4b5424aa6139c4c51 100644 (file)
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -411,4 +411,5 @@ LIBBPF_1.3.0 {
 } LIBBPF_1.2.0;
 
 LIBBPF_1.4.0 {
+               bpf_token_create;
 } LIBBPF_1.3.0;