summaryrefslogtreecommitdiff
path: root/tools/include
diff options
context:
space:
mode:
authorAndrii Nakryiko <andrii@kernel.org>2023-12-19 18:37:35 +0300
committerAndrii Nakryiko <andrii@kernel.org>2023-12-19 19:23:03 +0300
commitd17aff807f845cf93926c28705216639c7279110 (patch)
tree2c7baaedac92384e2d4d083ddebfba920b3390ae /tools/include
parent2130c519a401e576647040043cb46d6fdc361dcc (diff)
downloadlinux-d17aff807f845cf93926c28705216639c7279110.tar.xz
Revert BPF token-related functionality
This patch includes the following revert (one conflicting BPF FS patch and three token patch sets, represented by merge commits): - revert 0f5d5454c723 "Merge branch 'bpf-fs-mount-options-parsing-follow-ups'"; - revert 750e785796bb "bpf: Support uid and gid when mounting bpffs"; - revert 733763285acf "Merge branch 'bpf-token-support-in-libbpf-s-bpf-object'"; - revert c35919dcce28 "Merge branch 'bpf-token-and-bpf-fs-based-delegation'". Link: https://lore.kernel.org/bpf/CAHk-=wg7JuFYwGy=GOMbRCtOL+jwSQsdUaBsRWkDVYbxipbM5A@mail.gmail.com Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'tools/include')
-rw-r--r--tools/include/uapi/linux/bpf.h42
1 files changed, 0 insertions, 42 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index e0545201b55f..7f24d898efbb 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -847,36 +847,6 @@ union bpf_iter_link_info {
* Returns zero on success. On error, -1 is returned and *errno*
* is set appropriately.
*
- * BPF_TOKEN_CREATE
- * Description
- * Create BPF token with embedded information about what
- * BPF-related functionality it allows:
- * - a set of allowed bpf() syscall commands;
- * - a set of allowed BPF map types to be created with
- * BPF_MAP_CREATE command, if BPF_MAP_CREATE itself is allowed;
- * - a set of allowed BPF program types and BPF program attach
- * types to be loaded with BPF_PROG_LOAD command, if
- * BPF_PROG_LOAD itself is allowed.
- *
- * BPF token is created (derived) from an instance of BPF FS,
- * assuming it has necessary delegation mount options specified.
- * This BPF token can be passed as an extra parameter to various
- * bpf() syscall commands to grant BPF subsystem functionality to
- * unprivileged processes.
- *
- * When created, BPF token is "associated" with the owning
- * user namespace of BPF FS instance (super block) that it was
- * derived from, and subsequent BPF operations performed with
- * BPF token would be performing capabilities checks (i.e.,
- * CAP_BPF, CAP_PERFMON, CAP_NET_ADMIN, CAP_SYS_ADMIN) within
- * that user namespace. Without BPF token, such capabilities
- * have to be granted in init user namespace, making bpf()
- * syscall incompatible with user namespace, for the most part.
- *
- * Return
- * A new file descriptor (a nonnegative integer), or -1 if an
- * error occurred (in which case, *errno* is set appropriately).
- *
* NOTES
* eBPF objects (maps and programs) can be shared between processes.
*
@@ -931,8 +901,6 @@ enum bpf_cmd {
BPF_ITER_CREATE,
BPF_LINK_DETACH,
BPF_PROG_BIND_MAP,
- BPF_TOKEN_CREATE,
- __MAX_BPF_CMD,
};
enum bpf_map_type {
@@ -983,7 +951,6 @@ enum bpf_map_type {
BPF_MAP_TYPE_BLOOM_FILTER,
BPF_MAP_TYPE_USER_RINGBUF,
BPF_MAP_TYPE_CGRP_STORAGE,
- __MAX_BPF_MAP_TYPE
};
/* Note that tracing related programs such as
@@ -1028,7 +995,6 @@ enum bpf_prog_type {
BPF_PROG_TYPE_SK_LOOKUP,
BPF_PROG_TYPE_SYSCALL, /* a program that can execute syscalls */
BPF_PROG_TYPE_NETFILTER,
- __MAX_BPF_PROG_TYPE
};
enum bpf_attach_type {
@@ -1437,7 +1403,6 @@ union bpf_attr {
* to using 5 hash functions).
*/
__u64 map_extra;
- __u32 map_token_fd;
};
struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
@@ -1507,7 +1472,6 @@ union bpf_attr {
* truncated), or smaller (if log buffer wasn't filled completely).
*/
__u32 log_true_size;
- __u32 prog_token_fd;
};
struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -1620,7 +1584,6 @@ union bpf_attr {
* truncated), or smaller (if log buffer wasn't filled completely).
*/
__u32 btf_log_true_size;
- __u32 btf_token_fd;
};
struct {
@@ -1751,11 +1714,6 @@ union bpf_attr {
__u32 flags; /* extra flags */
} prog_bind_map;
- struct { /* struct used by BPF_TOKEN_CREATE command */
- __u32 flags;
- __u32 bpffs_fd;
- } token_create;
-
} __attribute__((aligned(8)));
/* The description below is an attempt at providing documentation to eBPF