Commit 404cbc14 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Add BPF token support to bpf_prog_load() API 



Wire through token_fd into bpf_prog_load().

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20240124022127.2379740-16-andrii@kernel.org
parent a3d63e85

tools/lib/bpf/bpf.c

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,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;
@@ -264,6 +264,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));

tools/lib/bpf/bpf.h

+2 −1
Original line number Diff line number Diff line
@@ -106,9 +106,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,