From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>
Cc: <linux-fsdevel@vger.kernel.org>,
<linux-security-module@vger.kernel.org>, <keescook@chromium.org>,
<brauner@kernel.org>, <lennart@poettering.net>,
<kernel-team@meta.com>, <sargun@sargun.me>
Subject: [PATCH v4 bpf-next 08/12] libbpf: add bpf_token_create() API
Date: Tue, 12 Sep 2023 14:29:02 -0700 [thread overview]
Message-ID: <20230912212906.3975866-9-andrii@kernel.org> (raw)
In-Reply-To: <20230912212906.3975866-1-andrii@kernel.org>
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 | 19 +++++++++++++++++++
tools/lib/bpf/bpf.h | 29 +++++++++++++++++++++++++++++
tools/lib/bpf/libbpf.map | 1 +
3 files changed, 49 insertions(+)
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index b0f1913763a3..593ff9ea120d 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -1271,3 +1271,22 @@ 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_path_fd, const char *bpffs_pathname,
+ 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_path_fd = bpffs_path_fd;
+ attr.token_create.bpffs_pathname = ptr_to_u64(bpffs_pathname);
+ 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 74c2887cfd24..16d5c257066c 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -635,6 +635,35 @@ 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, pinning
+ * it at the specified location in BPF FS.
+ *
+ * BPF token created and pinned with this API can be subsequently opened using
+ * bpf_obj_get() API to obtain FD that can be passed to bpf() syscall for
+ * commands like BPF_PROG_LOAD, BPF_MAP_CREATE, etc.
+ *
+ * @param pin_path_fd O_PATH FD (see man 2 openat() for semantics) specifying,
+ * in combination with *pin_pathname*, target location in BPF FS at which to
+ * create and pin BPF token.
+ * @param pin_pathname absolute or relative path specifying, in combination
+ * with *pin_path_fd*, specifying in combination with *pin_path_fd*, target
+ * location in BPF FS at which to create and pin BPF token.
+ * @param opts optional BPF token creation options, can be NULL
+ *
+ * @return 0, on success; negative error code, otherwise (errno is also set to
+ * the error code)
+ */
+LIBBPF_API int bpf_token_create(int bpffs_path_fd, const char *bpffs_pathname,
+ 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 57712321490f..c45c28a5e14c 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -400,4 +400,5 @@ LIBBPF_1.3.0 {
bpf_program__attach_netfilter;
bpf_program__attach_tcx;
bpf_program__attach_uprobe_multi;
+ bpf_token_create;
} LIBBPF_1.2.0;
--
2.34.1
next prev parent reply other threads:[~2023-09-12 21:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 21:28 [PATCH v4 bpf-next 00/12] BPF token and BPF FS-based delegation Andrii Nakryiko
2023-09-12 21:28 ` [PATCH v4 bpf-next 01/12] bpf: add BPF token delegation mount options to BPF FS Andrii Nakryiko
2023-09-12 21:28 ` [PATCH v4 bpf-next 02/12] bpf: introduce BPF token object Andrii Nakryiko
2023-09-12 21:46 ` Andrii Nakryiko
2023-09-13 21:46 ` [PATCH v4 2/12] " Paul Moore
2023-09-14 17:31 ` Andrii Nakryiko
2023-09-15 0:55 ` Paul Moore
2023-09-15 20:59 ` Andrii Nakryiko
2023-09-21 22:18 ` Paul Moore
2023-09-22 9:27 ` Paul Moore
2023-09-22 22:35 ` Andrii Nakryiko
2023-09-26 21:32 ` Paul Moore
2023-10-10 21:19 ` Paul Moore
2023-10-12 0:32 ` Andrii Nakryiko
2023-09-12 21:28 ` [PATCH v4 bpf-next 03/12] bpf: add BPF token support to BPF_MAP_CREATE command Andrii Nakryiko
2023-09-12 21:28 ` [PATCH v4 bpf-next 04/12] bpf: add BPF token support to BPF_BTF_LOAD command Andrii Nakryiko
2023-09-12 21:28 ` [PATCH v4 bpf-next 05/12] bpf: add BPF token support to BPF_PROG_LOAD command Andrii Nakryiko
2023-09-12 21:29 ` [PATCH v4 bpf-next 06/12] bpf: take into account BPF token when fetching helper protos Andrii Nakryiko
2023-09-13 9:45 ` kernel test robot
2023-09-13 18:41 ` kernel test robot
2023-09-12 21:29 ` [PATCH v4 bpf-next 07/12] bpf: consistenly use BPF token throughout BPF verifier logic Andrii Nakryiko
2023-09-13 22:15 ` kernel test robot
2023-09-12 21:29 ` Andrii Nakryiko [this message]
2023-09-12 21:42 ` [PATCH v4 bpf-next 08/12] libbpf: add bpf_token_create() API Andrii Nakryiko
2023-09-12 21:29 ` [PATCH v4 bpf-next 09/12] libbpf: add BPF token support to bpf_map_create() API Andrii Nakryiko
2023-09-12 21:29 ` [PATCH v4 bpf-next 10/12] libbpf: add BPF token support to bpf_btf_load() API Andrii Nakryiko
2023-09-12 21:29 ` [PATCH v4 bpf-next 11/12] libbpf: add BPF token support to bpf_prog_load() API Andrii Nakryiko
2023-09-12 21:29 ` [PATCH v4 bpf-next 12/12] selftests/bpf: add BPF token-enabled tests Andrii Nakryiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230912212906.3975866-9-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=keescook@chromium.org \
--cc=kernel-team@meta.com \
--cc=lennart@poettering.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sargun@sargun.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).