From 3504484430f1d004d7eb10c5d04577c0b2d84cb3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 1 Dec 2019 11:03:27 +0100 Subject: sys/linux: update consts Regenerate const files for all arches. --- sys/linux/bpf_arm64.const | 6 ++++++ sys/linux/dev_cdrom_amd64.const | 2 ++ sys/linux/dev_cdrom_arm64.const | 2 ++ sys/linux/dev_cdrom_ppc64le.const | 2 ++ sys/linux/dev_dri_amd64.const | 2 ++ sys/linux/dev_dri_arm64.const | 2 ++ sys/linux/dev_dri_ppc64le.const | 2 ++ sys/linux/dev_video4linux.txt | 3 ++- sys/linux/gen/arm64.go | 20 +++++++++++++------- sys/linux/socket_nfc_amd64.const | 1 + sys/linux/socket_nfc_arm64.const | 1 + sys/linux/socket_nfc_ppc64le.const | 1 + 12 files changed, 36 insertions(+), 8 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/bpf_arm64.const b/sys/linux/bpf_arm64.const index 73eaf26d8..8e73923c8 100644 --- a/sys/linux/bpf_arm64.const +++ b/sys/linux/bpf_arm64.const @@ -41,6 +41,7 @@ BPF_F_ALLOW_OVERRIDE = 1 BPF_F_ANY_ALIGNMENT = 2 BPF_F_CLONE = 512 BPF_F_LOCK = 4 +BPF_F_MMAPABLE = 1024 BPF_F_NO_COMMON_LRU = 2 BPF_F_NO_PREALLOC = 1 BPF_F_NUMA_NODE = 4 @@ -50,6 +51,7 @@ BPF_F_RDONLY_PROG = 128 BPF_F_STACK_BUILD_ID = 32 BPF_F_STRICT_ALIGNMENT = 1 BPF_F_TEST_RND_HI32 = 4 +BPF_F_TEST_STATE_FREQ = 8 BPF_F_WRONLY = 16 BPF_F_WRONLY_PROG = 256 BPF_F_ZERO_SEED = 64 @@ -150,6 +152,7 @@ BPF_PROG_TYPE_SK_SKB = 14 BPF_PROG_TYPE_SOCKET_FILTER = 1 BPF_PROG_TYPE_SOCK_OPS = 13 BPF_PROG_TYPE_TRACEPOINT = 5 +BPF_PROG_TYPE_TRACING = 26 BPF_PROG_TYPE_XDP = 6 BPF_PSEUDO_CALL = 1 BPF_PSEUDO_MAP_FD = 1 @@ -174,6 +177,9 @@ BPF_ST = 2 BPF_STX = 3 BPF_SUB0 = 1 BPF_TASK_FD_QUERY = 20 +BPF_TRACE_FENTRY = 24 +BPF_TRACE_FEXIT = 25 +BPF_TRACE_RAW_TP = 23 BPF_W0 = 0 BPF_XADD0 = 6 BPF_XOR0 = 10 diff --git a/sys/linux/dev_cdrom_amd64.const b/sys/linux/dev_cdrom_amd64.const index 447324a5a..0222f9eb5 100644 --- a/sys/linux/dev_cdrom_amd64.const +++ b/sys/linux/dev_cdrom_amd64.const @@ -1,4 +1,5 @@ # AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 CDO_AUTO_CLOSE = 1 CDO_AUTO_EJECT = 2 CDO_CHECK_TYPE = 16 @@ -72,3 +73,4 @@ DVD_STRUCT_DISCKEY = 2 DVD_STRUCT_MANUFACT = 4 DVD_STRUCT_PHYSICAL = 0 __NR_ioctl = 16 +__NR_openat = 257 diff --git a/sys/linux/dev_cdrom_arm64.const b/sys/linux/dev_cdrom_arm64.const index 838983e6f..bb5fd6fbd 100644 --- a/sys/linux/dev_cdrom_arm64.const +++ b/sys/linux/dev_cdrom_arm64.const @@ -1,4 +1,5 @@ # AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 CDO_AUTO_CLOSE = 1 CDO_AUTO_EJECT = 2 CDO_CHECK_TYPE = 16 @@ -72,3 +73,4 @@ DVD_STRUCT_DISCKEY = 2 DVD_STRUCT_MANUFACT = 4 DVD_STRUCT_PHYSICAL = 0 __NR_ioctl = 29 +__NR_openat = 56 diff --git a/sys/linux/dev_cdrom_ppc64le.const b/sys/linux/dev_cdrom_ppc64le.const index 7e7bf228b..5bb356b46 100644 --- a/sys/linux/dev_cdrom_ppc64le.const +++ b/sys/linux/dev_cdrom_ppc64le.const @@ -1,4 +1,5 @@ # AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 CDO_AUTO_CLOSE = 1 CDO_AUTO_EJECT = 2 CDO_CHECK_TYPE = 16 @@ -72,3 +73,4 @@ DVD_STRUCT_DISCKEY = 2 DVD_STRUCT_MANUFACT = 4 DVD_STRUCT_PHYSICAL = 0 __NR_ioctl = 54 +__NR_openat = 286 diff --git a/sys/linux/dev_dri_amd64.const b/sys/linux/dev_dri_amd64.const index 65296bceb..a679225dc 100644 --- a/sys/linux/dev_dri_amd64.const +++ b/sys/linux/dev_dri_amd64.const @@ -1,6 +1,7 @@ # AUTOGENERATED FILE AGP_USER_CACHED_MEMORY = 65537 AGP_USER_MEMORY = 65536 +# AT_FDCWD is not set DRM_ADD_COMMAND = 0 DRM_DISPLAY_MODE_LEN = 32 DRM_INST_HANDLER = 2 @@ -102,3 +103,4 @@ _DRM_VBLANK_SECONDARY = 536870912 _DRM_VBLANK_SIGNAL = 1073741824 _DRM_WRITE_COMBINING = 16 __NR_ioctl = 16 +__NR_openat = 257 diff --git a/sys/linux/dev_dri_arm64.const b/sys/linux/dev_dri_arm64.const index 540fa517a..8334651a6 100644 --- a/sys/linux/dev_dri_arm64.const +++ b/sys/linux/dev_dri_arm64.const @@ -1,6 +1,7 @@ # AUTOGENERATED FILE AGP_USER_CACHED_MEMORY = 65537 AGP_USER_MEMORY = 65536 +# AT_FDCWD is not set DRM_ADD_COMMAND = 0 DRM_DISPLAY_MODE_LEN = 32 DRM_INST_HANDLER = 2 @@ -102,3 +103,4 @@ _DRM_VBLANK_SECONDARY = 536870912 _DRM_VBLANK_SIGNAL = 1073741824 _DRM_WRITE_COMBINING = 16 __NR_ioctl = 29 +__NR_openat = 56 diff --git a/sys/linux/dev_dri_ppc64le.const b/sys/linux/dev_dri_ppc64le.const index 110331380..41c1f63ee 100644 --- a/sys/linux/dev_dri_ppc64le.const +++ b/sys/linux/dev_dri_ppc64le.const @@ -1,6 +1,7 @@ # AUTOGENERATED FILE AGP_USER_CACHED_MEMORY = 65537 AGP_USER_MEMORY = 65536 +# AT_FDCWD is not set DRM_ADD_COMMAND = 0 DRM_DISPLAY_MODE_LEN = 32 DRM_INST_HANDLER = 2 @@ -102,3 +103,4 @@ _DRM_VBLANK_SECONDARY = 536870912 _DRM_VBLANK_SIGNAL = 1073741824 _DRM_WRITE_COMBINING = 16 __NR_ioctl = 54 +__NR_openat = 286 diff --git a/sys/linux/dev_video4linux.txt b/sys/linux/dev_video4linux.txt index 08a8a651d..20babca75 100644 --- a/sys/linux/dev_video4linux.txt +++ b/sys/linux/dev_video4linux.txt @@ -4,9 +4,10 @@ # Constants for this descriptions were generated on the following tree: # https://source.codeaurora.org/quic/la/kernel/msm-4.9 msm-4.9 -include include include +include +include include include include diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 05cac472c..0ba561dad 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -1058,7 +1058,7 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "bpf_attach_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_attach_arg", TypeSize: 16}, Fields: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cgroup", FldName: "target_fd", TypeSize: 4}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "attach_bpf_fd", TypeSize: 4}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2}, BitMask: true}, }}}, {Key: StructKey{Name: "bpf_btf_info", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_btf_info", TypeSize: 16, ArgDir: 2}, Fields: []Type{ @@ -1086,7 +1086,7 @@ var structDescs_arm64 = []*KeyedStruct{ {Key: StructKey{Name: "bpf_detach_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_detach_arg", TypeSize: 16}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "target", TypeSize: 4}}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_prog", FldName: "prog", TypeSize: 4}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "flags", TypeSize: 4}}}, }}}, {Key: StructKey{Name: "bpf_framed_program"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_framed_program", IsVarlen: true}, Fields: []Type{ @@ -1226,7 +1226,7 @@ var structDescs_arm64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "ksize", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "vsize", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "max", TypeSize: 4}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "map_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512}, BitMask: true}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "map_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}, BitMask: true}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_bpf_map", FldName: "inner", TypeSize: 4, IsOptional: true}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "node", TypeSize: 4}}}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "map_name", TypeSize: 16}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, @@ -1301,7 +1301,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "fs_opt[\"mode\", fmt[oct, int32]]"}, FldName: "mode"}, }}}, {Key: StructKey{Name: "bpf_prog"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_prog", TypeSize: 120}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_prog_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_prog_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize8", FldName: "ninsn", TypeSize: 4}}, BitSize: 64, Path: []string{"insns"}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "insns", TypeSize: 8}, Type: &UnionType{Key: StructKey{Name: "bpf_instructions"}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "license", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", IsVarlen: true}, Kind: 2, SubKind: "bpf_licenses", Values: []string{"GPL\x00", "syzkaller\x00"}}}, @@ -1309,10 +1309,10 @@ var structDescs_arm64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "logsize", TypeSize: 4}}, Path: []string{"log"}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "log", TypeSize: 8, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_kern_version", FldName: "kern_version", TypeSize: 4}}, Vals: []uint64{265984, 266240, 266496}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_prog_load_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4}, BitMask: true}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_prog_load_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8}, BitMask: true}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "prog_name", TypeSize: 16}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 1}}}, Kind: 1, RangeBegin: 16, RangeEnd: 16}, &ResourceType{TypeCommon: TypeCommon{TypeName: "ifindex", FldName: "prog_ifindex", TypeSize: 4, IsOptional: true}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "expected_attach_type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bpf_attach_type", FldName: "expected_attach_type", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25}}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_btf", FldName: "btf_fd", TypeSize: 4, IsOptional: true}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "func_info_rec_size", TypeSize: 4}}, Val: 8}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "func_info", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "bpf_func_info"}}}, @@ -48236,6 +48236,7 @@ var consts_arm64 = []ConstValue{ {Name: "BPF_F_ANY_ALIGNMENT", Value: 2}, {Name: "BPF_F_CLONE", Value: 512}, {Name: "BPF_F_LOCK", Value: 4}, + {Name: "BPF_F_MMAPABLE", Value: 1024}, {Name: "BPF_F_NO_COMMON_LRU", Value: 2}, {Name: "BPF_F_NO_PREALLOC", Value: 1}, {Name: "BPF_F_NUMA_NODE", Value: 4}, @@ -48245,6 +48246,7 @@ var consts_arm64 = []ConstValue{ {Name: "BPF_F_STACK_BUILD_ID", Value: 32}, {Name: "BPF_F_STRICT_ALIGNMENT", Value: 1}, {Name: "BPF_F_TEST_RND_HI32", Value: 4}, + {Name: "BPF_F_TEST_STATE_FREQ", Value: 8}, {Name: "BPF_F_WRONLY", Value: 16}, {Name: "BPF_F_WRONLY_PROG", Value: 256}, {Name: "BPF_F_ZERO_SEED", Value: 64}, @@ -48345,6 +48347,7 @@ var consts_arm64 = []ConstValue{ {Name: "BPF_PROG_TYPE_SOCKET_FILTER", Value: 1}, {Name: "BPF_PROG_TYPE_SOCK_OPS", Value: 13}, {Name: "BPF_PROG_TYPE_TRACEPOINT", Value: 5}, + {Name: "BPF_PROG_TYPE_TRACING", Value: 26}, {Name: "BPF_PROG_TYPE_XDP", Value: 6}, {Name: "BPF_PSEUDO_CALL", Value: 1}, {Name: "BPF_PSEUDO_MAP_FD", Value: 1}, @@ -48369,6 +48372,9 @@ var consts_arm64 = []ConstValue{ {Name: "BPF_STX", Value: 3}, {Name: "BPF_SUB0", Value: 1}, {Name: "BPF_TASK_FD_QUERY", Value: 20}, + {Name: "BPF_TRACE_FENTRY", Value: 24}, + {Name: "BPF_TRACE_FEXIT", Value: 25}, + {Name: "BPF_TRACE_RAW_TP", Value: 23}, {Name: "BPF_W0"}, {Name: "BPF_XADD0", Value: 6}, {Name: "BPF_XOR0", Value: 10}, @@ -56088,4 +56094,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "46f2ff92a0e70abd56031edf71cbd3411c0a1591" +const revision_arm64 = "47ed1151a04be97f4fbc739805c3ab4e3b93603f" diff --git a/sys/linux/socket_nfc_amd64.const b/sys/linux/socket_nfc_amd64.const index c6a218072..06aa8d379 100644 --- a/sys/linux/socket_nfc_amd64.const +++ b/sys/linux/socket_nfc_amd64.const @@ -17,6 +17,7 @@ NFC_SOCKPROTO_LLCP = 1 NFC_SOCKPROTO_RAW = 0 SOCK_DGRAM = 2 SOCK_RAW = 3 +SOCK_SEQPACKET = 5 SOCK_STREAM = 1 SOL_NFC = 280 __NR_accept = 43 diff --git a/sys/linux/socket_nfc_arm64.const b/sys/linux/socket_nfc_arm64.const index 21fdd82f2..6209fe476 100644 --- a/sys/linux/socket_nfc_arm64.const +++ b/sys/linux/socket_nfc_arm64.const @@ -17,6 +17,7 @@ NFC_SOCKPROTO_LLCP = 1 NFC_SOCKPROTO_RAW = 0 SOCK_DGRAM = 2 SOCK_RAW = 3 +SOCK_SEQPACKET = 5 SOCK_STREAM = 1 SOL_NFC = 280 __NR_accept = 202 diff --git a/sys/linux/socket_nfc_ppc64le.const b/sys/linux/socket_nfc_ppc64le.const index e50fc54ee..3fc467a12 100644 --- a/sys/linux/socket_nfc_ppc64le.const +++ b/sys/linux/socket_nfc_ppc64le.const @@ -17,6 +17,7 @@ NFC_SOCKPROTO_LLCP = 1 NFC_SOCKPROTO_RAW = 0 SOCK_DGRAM = 2 SOCK_RAW = 3 +SOCK_SEQPACKET = 5 SOCK_STREAM = 1 SOL_NFC = 280 __NR_accept = 330 -- cgit mrf-deployment