libbpf: add BPF token support to bpf_prog_load() API

Wire through token_fd into bpf_prog_load().

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20231130185229.2688956-16-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 544ae2376b6bd8b0dd4bcd0ebb8616bc7c5d0289..f4e1da3c6d5f9f45731417ce9e3c16affef9fc3f 100644 (file)
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -234,7 +234,7 @@ int bpf_prog_load(enum bpf_prog_type prog_type,
                  const struct bpf_insn *insns, size_t insn_cnt,
                  struct bpf_prog_load_opts *opts)
 {
-       const size_t attr_sz = offsetofend(union bpf_attr, log_true_size);
+       const size_t attr_sz = offsetofend(union bpf_attr, prog_token_fd);
        void *finfo = NULL, *linfo = NULL;
        const char *func_info, *line_info;
        __u32 log_size, log_level, attach_prog_fd, attach_btf_obj_fd;
@@ -263,6 +263,7 @@ int bpf_prog_load(enum bpf_prog_type prog_type,
        attr.prog_flags = OPTS_GET(opts, prog_flags, 0);
        attr.prog_ifindex = OPTS_GET(opts, prog_ifindex, 0);
        attr.kern_version = OPTS_GET(opts, kern_version, 0);
+       attr.prog_token_fd = OPTS_GET(opts, token_fd, 0);
 
        if (prog_name && kernel_supports(NULL, FEAT_PROG_NAME))
                libbpf_strlcpy(attr.prog_name, prog_name, sizeof(attr.prog_name));

diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 4b0f25e97b0d8a52149e279919b327f2dabdc4df..991b86bfe7e4123e95678178b3a894ae07fcb3eb 100644 (file)
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -105,9 +105,10 @@ struct bpf_prog_load_opts {
         * If kernel doesn't support this feature, log_size is left unchanged.
         */
        __u32 log_true_size;
+       __u32 token_fd;
        size_t :0;
 };
-#define bpf_prog_load_opts__last_field log_true_size
+#define bpf_prog_load_opts__last_field token_fd
 
 LIBBPF_API int bpf_prog_load(enum bpf_prog_type prog_type,
                             const char *prog_name, const char *license,