[v2,bpf-next,12/30] libbpf: add bpf_token_create() API

Message ID	20240124022127.2379740-13-andrii@kernel.org (mailing list archive)
State	Handled Elsewhere
Delegated to:	Paul Moore
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5203E156E4; Wed, 24 Jan 2024 02:22:16 +0000 (UTC) From: Andrii Nakryiko <andrii@kernel.org> To: bpf@vger.kernel.org, netdev@vger.kernel.org, paul@paul-moore.com, brauner@kernel.org Cc: torvalds@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v2 bpf-next 12/30] libbpf: add bpf_token_create() API Date: Tue, 23 Jan 2024 18:21:09 -0800 Message-Id: <20240124022127.2379740-13-andrii@kernel.org> In-Reply-To: <20240124022127.2379740-1-andrii@kernel.org> References: <20240124022127.2379740-1-andrii@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	BPF token \| expand [v2,bpf-next,00/30] BPF token [v2,bpf-next,01/30] bpf: align CAP_NET_ADMIN checks with bpf_capable() approach [v2,bpf-next,02/30] bpf: add BPF token delegation mount options to BPF FS [v2,bpf-next,03/30] bpf: introduce BPF token object [v2,bpf-next,04/30] bpf: add BPF token support to BPF_MAP_CREATE command [v2,bpf-next,05/30] bpf: add BPF token support to BPF_BTF_LOAD command [v2,bpf-next,06/30] bpf: add BPF token support to BPF_PROG_LOAD command [v2,bpf-next,07/30] bpf: take into account BPF token when fetching helper protos [v2,bpf-next,08/30] bpf: consistently use BPF token throughout BPF verifier logic [v2,bpf-next,09/30] bpf,lsm: refactor bpf_prog_alloc/bpf_prog_free LSM hooks [v2,bpf-next,10/30] bpf,lsm: refactor bpf_map_alloc/bpf_map_free LSM hooks [v2,bpf-next,11/30] bpf,lsm: add BPF token LSM hooks [v2,bpf-next,12/30] libbpf: add bpf_token_create() API [v2,bpf-next,13/30] libbpf: add BPF token support to bpf_map_create() API [v2,bpf-next,14/30] libbpf: add BPF token support to bpf_btf_load() API [v2,bpf-next,15/30] libbpf: add BPF token support to bpf_prog_load() API [v2,bpf-next,16/30] selftests/bpf: add BPF token-enabled tests [v2,bpf-next,17/30] bpf,selinux: allocate bpf_security_struct per BPF token [v2,bpf-next,18/30] bpf: fail BPF_TOKEN_CREATE if no delegation option was set on BPF FS [v2,bpf-next,19/30] bpf: support symbolic BPF FS delegation mount options [v2,bpf-next,20/30] selftests/bpf: utilize string values for delegate_xxx mount options [v2,bpf-next,21/30] libbpf: split feature detectors definitions from cached results [v2,bpf-next,22/30] libbpf: further decouple feature checking logic from bpf_object [v2,bpf-next,23/30] libbpf: move feature detection code into its own file [v2,bpf-next,24/30] libbpf: wire up token_fd into feature probing logic [v2,bpf-next,25/30] libbpf: wire up BPF token support at BPF object level [v2,bpf-next,26/30] selftests/bpf: add BPF object loading tests with explicit token passing [v2,bpf-next,27/30] selftests/bpf: add tests for BPF object load with implicit token [v2,bpf-next,28/30] libbpf: support BPF token path setting through LIBBPF_BPF_TOKEN_PATH envvar [v2,bpf-next,29/30] selftests/bpf: add tests for LIBBPF_BPF_TOKEN_PATH envvar [v2,bpf-next,30/30] selftests/bpf: incorporate LSM policy to token-based tests

Message ID

20240124022127.2379740-13-andrii@kernel.org (mailing list archive)

State

Handled Elsewhere

Delegated to:

Paul Moore

Headers

From: Andrii Nakryiko <andrii@kernel.org>
To: bpf@vger.kernel.org,
	netdev@vger.kernel.org,
	paul@paul-moore.com,
	brauner@kernel.org
Cc: torvalds@linux-foundation.org,
	linux-fsdevel@vger.kernel.org,
	linux-security-module@vger.kernel.org,
	kernel-team@meta.com
Subject: [PATCH v2 bpf-next 12/30] libbpf: add bpf_token_create() API
Date: Tue, 23 Jan 2024 18:21:09 -0800
Message-Id: <20240124022127.2379740-13-andrii@kernel.org>
In-Reply-To: <20240124022127.2379740-1-andrii@kernel.org>
References: <20240124022127.2379740-1-andrii@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

BPF token | expand

Commit Message

Andrii Nakryiko Jan. 24, 2024, 2:21 a.m. UTC

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

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 tools/lib/bpf/bpf.c      | 17 +++++++++++++++++
 tools/lib/bpf/bpf.h      | 24 ++++++++++++++++++++++++
 tools/lib/bpf/libbpf.map |  1 +
 3 files changed, 42 insertions(+)

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 9dc9625651dc..d4019928a864 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -1287,3 +1287,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 d0f53772bdc0..e49254c9f68f 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -640,6 +640,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 91c5aef7dae7..d9e1f57534fa 100644
--- 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;

[v2,bpf-next,12/30] libbpf: add bpf_token_create() API

Commit Message

Patch