From 1e8208402d9c84d5f3ee6e33b63db8befbf61032 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Mar 2019 13:40:11 +0100 Subject: sys/linux: regenerate and fix const files 1. Move fsverity descriptions to a separate file which is not regenerated automatically. It was dropped from linux-next. 2. Fix tlk_device.txt name in syz-extract. 3. Update some socket consts e.g. s/SO_TIMESTAMPING/SO_TIMESTAMPING_OLD/. 4. Regenerate const files on current upstream head. --- sys/linux/gen/arm.go | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'sys/linux/gen/arm.go') diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 36965786f..77158de45 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -1025,7 +1025,7 @@ var structDescs_arm = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 133}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "regs", TypeSize: 1}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "off", TypeSize: 2}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 2, RangeEnd: 93}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "func", TypeSize: 4}}, Kind: 2, RangeEnd: 98}, }}}, {Key: StructKey{Name: "bpf_insn_exit"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "bpf_insn_exit", TypeSize: 8}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "code", TypeSize: 1}}, Val: 149}, @@ -5159,7 +5159,7 @@ var structDescs_arm = []*KeyedStruct{ }}}, {Key: StructKey{Name: "fuse_init_out"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fuse_init_out", TypeSize: 64}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "maj", TypeSize: 4}}, Val: 7}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "min", TypeSize: 4}}, Val: 28}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "min", TypeSize: 4}}, Val: 29}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "max_readahead", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fuse_init_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152}, BitMask: true}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "max_background", TypeSize: 2}}}, @@ -34019,6 +34019,12 @@ var syscalls_arm = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "name", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", IsVarlen: true}, Kind: 2}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{1, 2, 4}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_memfd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {NR: 400, Name: "migrate_pages", CallName: "migrate_pages", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "pid", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "maxnode", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "old", TypeSize: 4}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "new", TypeSize: 4}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, + }}, {NR: 219, Name: "mincore", CallName: "mincore", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "size", TypeSize: 4}}, Buf: "addr"}, @@ -41510,7 +41516,7 @@ var consts_arm = []ConstValue{ {Name: "FUSE_HANDLE_KILLPRIV", Value: 524288}, {Name: "FUSE_HAS_IOCTL_DIR", Value: 2048}, {Name: "FUSE_IOCTL_RETRY", Value: 4}, - {Name: "FUSE_KERNEL_MINOR_VERSION", Value: 28}, + {Name: "FUSE_KERNEL_MINOR_VERSION", Value: 29}, {Name: "FUSE_KERNEL_VERSION", Value: 7}, {Name: "FUSE_NOTIFY_DELETE", Value: 6}, {Name: "FUSE_NOTIFY_INVAL_ENTRY", Value: 3}, @@ -44844,7 +44850,7 @@ var consts_arm = []ConstValue{ {Name: "SO_RCVBUF", Value: 8}, {Name: "SO_RCVBUFFORCE", Value: 33}, {Name: "SO_RCVLOWAT", Value: 18}, - {Name: "SO_RCVTIMEO", Value: 20}, + {Name: "SO_RCVTIMEO_OLD", Value: 20}, {Name: "SO_RDS_MSG_RXPATH_LATENCY", Value: 10}, {Name: "SO_RDS_TRANSPORT", Value: 8}, {Name: "SO_REUSEADDR", Value: 2}, @@ -44854,10 +44860,10 @@ var consts_arm = []ConstValue{ {Name: "SO_SNDBUF", Value: 7}, {Name: "SO_SNDBUFFORCE", Value: 32}, {Name: "SO_SNDLOWAT", Value: 19}, - {Name: "SO_SNDTIMEO", Value: 21}, - {Name: "SO_TIMESTAMP", Value: 29}, - {Name: "SO_TIMESTAMPING", Value: 37}, - {Name: "SO_TIMESTAMPNS", Value: 35}, + {Name: "SO_SNDTIMEO_OLD", Value: 21}, + {Name: "SO_TIMESTAMPING_OLD", Value: 37}, + {Name: "SO_TIMESTAMPNS_OLD", Value: 35}, + {Name: "SO_TIMESTAMP_OLD", Value: 29}, {Name: "SO_TXTIME", Value: 61}, {Name: "SO_TYPE", Value: 3}, {Name: "SO_VM_SOCKETS_BUFFER_MAX_SIZE", Value: 2}, @@ -47058,7 +47064,7 @@ var consts_arm = []ConstValue{ {Name: "_LINUX_CAPABILITY_VERSION_1", Value: 429392688}, {Name: "_LINUX_CAPABILITY_VERSION_2", Value: 537333798}, {Name: "_LINUX_CAPABILITY_VERSION_3", Value: 537396514}, - {Name: "__BPF_FUNC_MAX_ID", Value: 93}, + {Name: "__BPF_FUNC_MAX_ID", Value: 98}, {Name: "__MAX_BPF_REG", Value: 11}, {Name: "__NR_accept", Value: 285}, {Name: "__NR_accept4", Value: 366}, @@ -47176,6 +47182,7 @@ var consts_arm = []ConstValue{ {Name: "__NR_mbind", Value: 319}, {Name: "__NR_membarrier", Value: 389}, {Name: "__NR_memfd_create", Value: 385}, + {Name: "__NR_migrate_pages", Value: 400}, {Name: "__NR_mincore", Value: 219}, {Name: "__NR_mkdir", Value: 39}, {Name: "__NR_mkdirat", Value: 323}, @@ -47353,4 +47360,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "89af28e08a5fe6430ecedad595a5f602ab9263a2" +const revision_arm = "4fb2c502fa3c67c71fe60ddf2550873f4335a914" -- cgit mrf-deployment