aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2016-11-28 18:29:10 +0100
committerDmitry Vyukov <dvyukov@google.com>2016-11-28 18:29:10 +0100
commit4dea52c066da20a2f37d9f2be23162a1c220b1ec (patch)
tree82e06b9bbcce342d4d2a3ef877d7f4b6c010de83 /sys
parentee3c2c3591a91265076bd89515cb217a5ea5a561 (diff)
sys: add new bpf descriptions
These were just added to net-next.
Diffstat (limited to 'sys')
-rw-r--r--sys/bpf.txt21
-rw-r--r--sys/bpf_amd64.const8
-rw-r--r--sys/bpf_arm64.const8
-rw-r--r--sys/bpf_ppc64le.const8
-rw-r--r--sys/sys.txt4
-rw-r--r--sys/sys_amd64.const1
-rw-r--r--sys/sys_arm64.const1
-rw-r--r--sys/sys_ppc64le.const1
8 files changed, 47 insertions, 5 deletions
diff --git a/sys/bpf.txt b/sys/bpf.txt
index 40dce2b9c..c350a4ebe 100644
--- a/sys/bpf.txt
+++ b/sys/bpf.txt
@@ -20,6 +20,8 @@ bpf$OBJ_PIN_MAP(cmd const[BPF_OBJ_PIN], arg ptr[in, bpf_obj_pin_map], size len[a
bpf$OBJ_PIN_PROG(cmd const[BPF_OBJ_PIN], arg ptr[in, bpf_obj_pin_prog], size len[arg])
bpf$OBJ_GET_MAP(cmd const[BPF_OBJ_GET], arg ptr[in, bpf_obj_get], size len[arg]) fd_bpf_map
bpf$OBJ_GET_PROG(cmd const[BPF_OBJ_GET], arg ptr[in, bpf_obj_get], size len[arg]) fd_bpf_prog
+bpf$BPF_PROG_ATTACH(cmd const[BPF_PROG_ATTACH], arg ptr[in, bpf_attach_arg], size len[arg])
+bpf$BPF_PROG_DETACH(cmd const[BPF_PROG_DETACH], arg ptr[in, bpf_detach_arg], size len[arg])
bpf_map_create_arg {
type flags[bpf_map_type, int32]
@@ -101,7 +103,20 @@ bpf_obj_get {
fd const[0, int32]
}
-bpf_map_type = BPF_MAP_TYPE_HASH, BPF_MAP_TYPE_ARRAY, BPF_MAP_TYPE_PROG_ARRAY, BPF_MAP_TYPE_PERF_EVENT_ARRAY, BPF_MAP_TYPE_STACK_TRACE, BPF_MAP_TYPE_CGROUP_ARRAY, BPF_MAP_TYPE_PERCPU_HASH, BPF_MAP_TYPE_PERCPU_ARRAY
+bpf_attach_arg {
+ target fd
+ prog fd_bpf_prog
+ type flags[bpf_attach_type, int32]
+}
+
+bpf_detach_arg {
+ target const[0, int32]
+ prog fd_bpf_prog
+ type flags[bpf_attach_type, int32]
+}
+
+bpf_map_type = BPF_MAP_TYPE_HASH, BPF_MAP_TYPE_ARRAY, BPF_MAP_TYPE_PROG_ARRAY, BPF_MAP_TYPE_PERF_EVENT_ARRAY, BPF_MAP_TYPE_STACK_TRACE, BPF_MAP_TYPE_CGROUP_ARRAY, BPF_MAP_TYPE_PERCPU_HASH, BPF_MAP_TYPE_PERCPU_ARRAY, BPF_MAP_TYPE_LRU_HASH, BPF_MAP_TYPE_LRU_PERCPU_HASH
bpf_map_flags = BPF_ANY, BPF_NOEXIST, BPF_EXIST
-bpf_prog_type = BPF_PROG_TYPE_SOCKET_FILTER, BPF_PROG_TYPE_KPROBE, BPF_PROG_TYPE_SCHED_CLS, BPF_PROG_TYPE_SCHED_ACT, BPF_PROG_TYPE_TRACEPOINT, BPF_PROG_TYPE_XDP, BPF_PROG_TYPE_PERF_EVENT
-map_flags = BPF_F_NO_PREALLOC
+bpf_prog_type = BPF_PROG_TYPE_SOCKET_FILTER, BPF_PROG_TYPE_KPROBE, BPF_PROG_TYPE_SCHED_CLS, BPF_PROG_TYPE_SCHED_ACT, BPF_PROG_TYPE_TRACEPOINT, BPF_PROG_TYPE_XDP, BPF_PROG_TYPE_PERF_EVENT, BPF_PROG_TYPE_CGROUP_SKB
+map_flags = BPF_F_NO_PREALLOC, BPF_F_NO_COMMON_LRU
+bpf_attach_type = BPF_CGROUP_INET_INGRESS, BPF_CGROUP_INET_EGRESS
diff --git a/sys/bpf_amd64.const b/sys/bpf_amd64.const
index 5a701fcf5..b220ef84b 100644
--- a/sys/bpf_amd64.const
+++ b/sys/bpf_amd64.const
@@ -1,6 +1,9 @@
# AUTOGENERATED FILE
BPF_ANY = 0
+BPF_CGROUP_INET_EGRESS = 1
+BPF_CGROUP_INET_INGRESS = 0
BPF_EXIST = 2
+BPF_F_NO_COMMON_LRU = 2
BPF_F_NO_PREALLOC = 1
BPF_MAP_CREATE = 0
BPF_MAP_DELETE_ELEM = 3
@@ -9,6 +12,8 @@ BPF_MAP_LOOKUP_ELEM = 1
BPF_MAP_TYPE_ARRAY = 2
BPF_MAP_TYPE_CGROUP_ARRAY = 8
BPF_MAP_TYPE_HASH = 1
+BPF_MAP_TYPE_LRU_HASH = 9
+BPF_MAP_TYPE_LRU_PERCPU_HASH = 10
BPF_MAP_TYPE_PERCPU_ARRAY = 6
BPF_MAP_TYPE_PERCPU_HASH = 5
BPF_MAP_TYPE_PERF_EVENT_ARRAY = 4
@@ -18,7 +23,10 @@ BPF_MAP_UPDATE_ELEM = 2
BPF_NOEXIST = 1
BPF_OBJ_GET = 7
BPF_OBJ_PIN = 6
+BPF_PROG_ATTACH = 8
+BPF_PROG_DETACH = 9
BPF_PROG_LOAD = 5
+BPF_PROG_TYPE_CGROUP_SKB = 8
BPF_PROG_TYPE_KPROBE = 2
BPF_PROG_TYPE_PERF_EVENT = 7
BPF_PROG_TYPE_SCHED_ACT = 4
diff --git a/sys/bpf_arm64.const b/sys/bpf_arm64.const
index 37c42c970..7f12957cd 100644
--- a/sys/bpf_arm64.const
+++ b/sys/bpf_arm64.const
@@ -1,6 +1,9 @@
# AUTOGENERATED FILE
BPF_ANY = 0
+BPF_CGROUP_INET_EGRESS = 1
+BPF_CGROUP_INET_INGRESS = 0
BPF_EXIST = 2
+BPF_F_NO_COMMON_LRU = 2
BPF_F_NO_PREALLOC = 1
BPF_MAP_CREATE = 0
BPF_MAP_DELETE_ELEM = 3
@@ -9,6 +12,8 @@ BPF_MAP_LOOKUP_ELEM = 1
BPF_MAP_TYPE_ARRAY = 2
BPF_MAP_TYPE_CGROUP_ARRAY = 8
BPF_MAP_TYPE_HASH = 1
+BPF_MAP_TYPE_LRU_HASH = 9
+BPF_MAP_TYPE_LRU_PERCPU_HASH = 10
BPF_MAP_TYPE_PERCPU_ARRAY = 6
BPF_MAP_TYPE_PERCPU_HASH = 5
BPF_MAP_TYPE_PERF_EVENT_ARRAY = 4
@@ -18,7 +23,10 @@ BPF_MAP_UPDATE_ELEM = 2
BPF_NOEXIST = 1
BPF_OBJ_GET = 7
BPF_OBJ_PIN = 6
+BPF_PROG_ATTACH = 8
+BPF_PROG_DETACH = 9
BPF_PROG_LOAD = 5
+BPF_PROG_TYPE_CGROUP_SKB = 8
BPF_PROG_TYPE_KPROBE = 2
BPF_PROG_TYPE_PERF_EVENT = 7
BPF_PROG_TYPE_SCHED_ACT = 4
diff --git a/sys/bpf_ppc64le.const b/sys/bpf_ppc64le.const
index efeb7dce1..1fcfbd0f4 100644
--- a/sys/bpf_ppc64le.const
+++ b/sys/bpf_ppc64le.const
@@ -1,6 +1,9 @@
# AUTOGENERATED FILE
BPF_ANY = 0
+BPF_CGROUP_INET_EGRESS = 1
+BPF_CGROUP_INET_INGRESS = 0
BPF_EXIST = 2
+BPF_F_NO_COMMON_LRU = 2
BPF_F_NO_PREALLOC = 1
BPF_MAP_CREATE = 0
BPF_MAP_DELETE_ELEM = 3
@@ -9,6 +12,8 @@ BPF_MAP_LOOKUP_ELEM = 1
BPF_MAP_TYPE_ARRAY = 2
BPF_MAP_TYPE_CGROUP_ARRAY = 8
BPF_MAP_TYPE_HASH = 1
+BPF_MAP_TYPE_LRU_HASH = 9
+BPF_MAP_TYPE_LRU_PERCPU_HASH = 10
BPF_MAP_TYPE_PERCPU_ARRAY = 6
BPF_MAP_TYPE_PERCPU_HASH = 5
BPF_MAP_TYPE_PERF_EVENT_ARRAY = 4
@@ -18,7 +23,10 @@ BPF_MAP_UPDATE_ELEM = 2
BPF_NOEXIST = 1
BPF_OBJ_GET = 7
BPF_OBJ_PIN = 6
+BPF_PROG_ATTACH = 8
+BPF_PROG_DETACH = 9
BPF_PROG_LOAD = 5
+BPF_PROG_TYPE_CGROUP_SKB = 8
BPF_PROG_TYPE_KPROBE = 2
BPF_PROG_TYPE_PERF_EVENT = 7
BPF_PROG_TYPE_SCHED_ACT = 4
diff --git a/sys/sys.txt b/sys/sys.txt
index c45eb6630..76920b37e 100644
--- a/sys/sys.txt
+++ b/sys/sys.txt
@@ -353,7 +353,7 @@ mount$fs(src ptr[in, string[filesystem]], dst filename, type ptr[in, string[file
umount2(path filename, flags flags[umount_flags])
pivot_root(new_root filename, put_old filename)
-filesystem = "sysfs", "rootfs", "ramfs", "tmpfs", "devtmpfs", "debugfs", "securityfs", "sockfs", "pipefs", "anon_inodefs", "devpts", "ext3", "ext2", "ext4", "hugetlbfs", "vfat", "ecryptfs", "kdbusfs", "fuseblk", "fuse", "rpc_pipefs", "nfs", "nfs4", "nfsd", "binfmt_misc", "autofs", "xfs", "jfs", "msdos", "ntfs", "minix", "hfs", "hfsplus", "qnx4", "ufs", "btrfs", "configfs", "ncpfs", "qnx6", "exofs", "befs", "vxfs", "gfs2", "gfs2meta", "fusectl", "bfs", "nsfs", "efs", "cifs", "efivarfs", "affs", "tracefs", "bdev", "ocfs2", "ocfs2_dlmfs", "hpfs", "proc", "afs", "reiserfs", "jffs2", "romfs", "aio", "sysv", "v7", "udf", "ceph", "pstore", "adfs", "9p", "hostfs", "squashfs", "cramfs", "iso9660", "coda", "nilfs2", "logfs", "overlay", "f2fs", "omfs", "ubifs", "openpromfs", "bpf"
+filesystem = "sysfs", "rootfs", "ramfs", "tmpfs", "devtmpfs", "debugfs", "securityfs", "sockfs", "pipefs", "anon_inodefs", "devpts", "ext3", "ext2", "ext4", "hugetlbfs", "vfat", "ecryptfs", "kdbusfs", "fuseblk", "fuse", "rpc_pipefs", "nfs", "nfs4", "nfsd", "binfmt_misc", "autofs", "xfs", "jfs", "msdos", "ntfs", "minix", "hfs", "hfsplus", "qnx4", "ufs", "btrfs", "configfs", "ncpfs", "qnx6", "exofs", "befs", "vxfs", "gfs2", "gfs2meta", "fusectl", "bfs", "nsfs", "efs", "cifs", "efivarfs", "affs", "tracefs", "bdev", "ocfs2", "ocfs2_dlmfs", "hpfs", "proc", "afs", "reiserfs", "jffs2", "romfs", "aio", "sysv", "v7", "udf", "ceph", "pstore", "adfs", "9p", "hostfs", "squashfs", "cramfs", "iso9660", "coda", "nilfs2", "logfs", "overlay", "f2fs", "omfs", "ubifs", "openpromfs", "bpf", "cgroup", "cgroup2"
sysfs$1(option const[1], fsname ptr[in, string])
sysfs$2(option const[2], fsindex intptr, fsname buffer[out])
@@ -1163,7 +1163,7 @@ fanotify_events = O_RDONLY, O_WRONLY, O_RDWR, O_LARGEFILE, O_CLOEXEC, O_APPEND,
fanotify_mark = FAN_MARK_ADD, FAN_MARK_REMOVE, FAN_MARK_FLUSH, FAN_MARK_DONT_FOLLOW, FAN_MARK_ONLYDIR, FAN_MARK_MOUNT, FAN_MARK_IGNORED_MASK, FAN_MARK_IGNORED_SURV_MODIFY
fanotify_mask = FAN_ACCESS, FAN_MODIFY, FAN_CLOSE_WRITE, FAN_CLOSE_NOWRITE, FAN_OPEN, FAN_OPEN_PERM, FAN_ACCESS_PERM, FAN_ONDIR, FAN_EVENT_ON_CHILD
faccessat_flags = 0x100, 0x200, 0x400, 0x800, 0x1000
-clone_flags = CLONE_CHILD_CLEARTID, CLONE_CHILD_SETTID, CLONE_FILES, CLONE_FS, CLONE_IO, CLONE_NEWIPC, CLONE_NEWNET, CLONE_NEWNS, CLONE_NEWPID, CLONE_NEWUTS, CLONE_PARENT, CLONE_PARENT_SETTID, CLONE_PTRACE, CLONE_SETTLS, CLONE_SIGHAND, CLONE_SYSVSEM, CLONE_THREAD, CLONE_UNTRACED, CLONE_VFORK, CLONE_VM
+clone_flags = CLONE_CHILD_CLEARTID, CLONE_CHILD_SETTID, CLONE_FILES, CLONE_FS, CLONE_IO, CLONE_NEWIPC, CLONE_NEWNET, CLONE_NEWNS, CLONE_NEWPID, CLONE_NEWUTS, CLONE_PARENT, CLONE_PARENT_SETTID, CLONE_PTRACE, CLONE_SETTLS, CLONE_SIGHAND, CLONE_SYSVSEM, CLONE_THREAD, CLONE_UNTRACED, CLONE_VFORK, CLONE_VM, CLONE_NEWCGROUP
futex_op = FUTEX_WAIT, FUTEX_WAIT_BITSET, FUTEX_WAKE, FUTEX_REQUEUE, FUTEX_CMP_REQUEUE
sync_file_flags = SYNC_FILE_RANGE_WAIT_BEFORE, SYNC_FILE_RANGE_WRITE, SYNC_FILE_RANGE_WAIT_AFTER
kcmp_flags = KCMP_FILE, KCMP_FILES, KCMP_FS, KCMP_IO, KCMP_SIGHAND, KCMP_SYSVSEM, KCMP_VM
diff --git a/sys/sys_amd64.const b/sys/sys_amd64.const
index 62a715410..51ab7ff17 100644
--- a/sys/sys_amd64.const
+++ b/sys/sys_amd64.const
@@ -25,6 +25,7 @@ CLONE_CHILD_SETTID = 16777216
CLONE_FILES = 1024
CLONE_FS = 512
CLONE_IO = 2147483648
+CLONE_NEWCGROUP = 33554432
CLONE_NEWIPC = 134217728
CLONE_NEWNET = 1073741824
CLONE_NEWNS = 131072
diff --git a/sys/sys_arm64.const b/sys/sys_arm64.const
index ce83a446d..bc5462dde 100644
--- a/sys/sys_arm64.const
+++ b/sys/sys_arm64.const
@@ -25,6 +25,7 @@ CLONE_CHILD_SETTID = 16777216
CLONE_FILES = 1024
CLONE_FS = 512
CLONE_IO = 2147483648
+CLONE_NEWCGROUP = 33554432
CLONE_NEWIPC = 134217728
CLONE_NEWNET = 1073741824
CLONE_NEWNS = 131072
diff --git a/sys/sys_ppc64le.const b/sys/sys_ppc64le.const
index a181071ee..e1f1ce49e 100644
--- a/sys/sys_ppc64le.const
+++ b/sys/sys_ppc64le.const
@@ -25,6 +25,7 @@ CLONE_CHILD_SETTID = 16777216
CLONE_FILES = 1024
CLONE_FS = 512
CLONE_IO = 2147483648
+CLONE_NEWCGROUP = 33554432
CLONE_NEWIPC = 134217728
CLONE_NEWNET = 1073741824
CLONE_NEWNS = 131072