From 7f7e03fda2e99767bf8a4b69737c2ca99a0b39fd Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 19 Sep 2018 12:25:11 +0200 Subject: sys/linux: add MFD_HUGETLB --- executor/defs.h | 10 +++++----- sys/linux/gen/386.go | 5 +++-- sys/linux/gen/amd64.go | 5 +++-- sys/linux/gen/arm.go | 5 +++-- sys/linux/gen/arm64.go | 5 +++-- sys/linux/gen/ppc64le.go | 5 +++-- sys/linux/sys.txt | 2 +- sys/linux/sys_386.const | 1 + sys/linux/sys_amd64.const | 1 + sys/linux/sys_arm.const | 1 + sys/linux/sys_arm64.const | 1 + sys/linux/sys_ppc64le.const | 1 + 12 files changed, 26 insertions(+), 16 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index 95eb188ee..280690a59 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "0ee91347a3707d4308d8d1be65fb999ce8e37b17" +#define SYZ_REVISION "6b884952207522ecf63e8318d62464d65c51d9f7" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "bc5881adfc71cbbf3fdfdabf7d1afddd41026fd0" +#define SYZ_REVISION "48b4fad0def71eb5e9f6261961870c6c57792a91" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "f8343d57c03fb2b253eacadb05904d0fbeae0751" +#define SYZ_REVISION "01eea65615a960a0b6363e521bb8141f342763ab" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "967cee3c729d7a2746669e927b93c0d87a06893e" +#define SYZ_REVISION "6f45b74370a0a5edbfaf0e32821e7b242316cce8" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "a610842219a91a7030a0bf1e4b0c540bf73116c7" +#define SYZ_REVISION "9b975a4915282e1af421b22b7529e04c9f85a69a" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 6298579ae..b31161e8e 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -29234,7 +29234,7 @@ var syscalls_386 = []*Syscall{ }}, {NR: 356, Name: "memfd_create", CallName: "memfd_create", Args: []Type{ &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}, BitMask: true}, + &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", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 294, Name: "migrate_pages", CallName: "migrate_pages", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "pid", TypeSize: 4}}, @@ -36912,6 +36912,7 @@ var consts_386 = []ConstValue{ {Name: "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE", Value: 64}, {Name: "MFD_ALLOW_SEALING", Value: 2}, {Name: "MFD_CLOEXEC", Value: 1}, + {Name: "MFD_HUGETLB", Value: 4}, {Name: "MIFF_REGISTER", Value: 1}, {Name: "MLOCK_ONFAULT", Value: 1}, {Name: "MMAP_PAGE_ZERO", Value: 1048576}, @@ -40754,4 +40755,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "0ee91347a3707d4308d8d1be65fb999ce8e37b17" +const revision_386 = "6b884952207522ecf63e8318d62464d65c51d9f7" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 9af8bc1d9..98148eb38 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -29704,7 +29704,7 @@ var syscalls_amd64 = []*Syscall{ }}, {NR: 319, Name: "memfd_create", CallName: "memfd_create", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "name", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", IsVarlen: true}, Kind: 2}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2}, BitMask: true}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2, 4}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 256, Name: "migrate_pages", CallName: "migrate_pages", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "pid", TypeSize: 4}}, @@ -37581,6 +37581,7 @@ var consts_amd64 = []ConstValue{ {Name: "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE", Value: 64}, {Name: "MFD_ALLOW_SEALING", Value: 2}, {Name: "MFD_CLOEXEC", Value: 1}, + {Name: "MFD_HUGETLB", Value: 4}, {Name: "MIFF_REGISTER", Value: 1}, {Name: "MLOCK_ONFAULT", Value: 1}, {Name: "MMAP_PAGE_ZERO", Value: 1048576}, @@ -41448,4 +41449,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "bc5881adfc71cbbf3fdfdabf7d1afddd41026fd0" +const revision_amd64 = "48b4fad0def71eb5e9f6261961870c6c57792a91" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index f05fa40bf..8bc3c8adc 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -28998,7 +28998,7 @@ var syscalls_arm = []*Syscall{ }}, {NR: 385, Name: "memfd_create", CallName: "memfd_create", Args: []Type{ &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}, BitMask: true}, + &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", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 219, Name: "mincore", CallName: "mincore", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 4}}, @@ -36782,6 +36782,7 @@ var consts_arm = []ConstValue{ {Name: "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE", Value: 64}, {Name: "MFD_ALLOW_SEALING", Value: 2}, {Name: "MFD_CLOEXEC", Value: 1}, + {Name: "MFD_HUGETLB", Value: 4}, {Name: "MIFF_REGISTER", Value: 1}, {Name: "MLOCK_ONFAULT", Value: 1}, {Name: "MMAP_PAGE_ZERO", Value: 1048576}, @@ -40620,4 +40621,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "f8343d57c03fb2b253eacadb05904d0fbeae0751" +const revision_arm = "01eea65615a960a0b6363e521bb8141f342763ab" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 5b87fbe38..a7843237c 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -29307,7 +29307,7 @@ var syscalls_arm64 = []*Syscall{ }}, {NR: 279, Name: "memfd_create", CallName: "memfd_create", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "name", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", IsVarlen: true}, Kind: 2}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2}, BitMask: true}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2, 4}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 238, Name: "migrate_pages", CallName: "migrate_pages", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "pid", TypeSize: 4}}, @@ -37022,6 +37022,7 @@ var consts_arm64 = []ConstValue{ {Name: "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE", Value: 64}, {Name: "MFD_ALLOW_SEALING", Value: 2}, {Name: "MFD_CLOEXEC", Value: 1}, + {Name: "MFD_HUGETLB", Value: 4}, {Name: "MIFF_REGISTER", Value: 1}, {Name: "MLOCK_ONFAULT", Value: 1}, {Name: "MMAP_PAGE_ZERO", Value: 1048576}, @@ -40842,4 +40843,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "967cee3c729d7a2746669e927b93c0d87a06893e" +const revision_arm64 = "6f45b74370a0a5edbfaf0e32821e7b242316cce8" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index a637441cd..f43deee6c 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -27795,7 +27795,7 @@ var syscalls_ppc64le = []*Syscall{ }}, {NR: 360, Name: "memfd_create", CallName: "memfd_create", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "name", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", IsVarlen: true}, Kind: 2}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2}, BitMask: true}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "memfd_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{1, 2, 4}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {NR: 258, Name: "migrate_pages", CallName: "migrate_pages", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "pid", FldName: "pid", TypeSize: 4}}, @@ -35317,6 +35317,7 @@ var consts_ppc64le = []ConstValue{ {Name: "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE", Value: 64}, {Name: "MFD_ALLOW_SEALING", Value: 2}, {Name: "MFD_CLOEXEC", Value: 1}, + {Name: "MFD_HUGETLB", Value: 4}, {Name: "MIFF_REGISTER", Value: 1}, {Name: "MLOCK_ONFAULT", Value: 1}, {Name: "MMAP_PAGE_ZERO", Value: 1048576}, @@ -38198,4 +38199,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "a610842219a91a7030a0bf1e4b0c540bf73116c7" +const revision_ppc64le = "9b975a4915282e1af421b22b7529e04c9f85a69a" diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt index a6289fdff..371667fc7 100644 --- a/sys/linux/sys.txt +++ b/sys/linux/sys.txt @@ -859,7 +859,7 @@ mmap_flags = MAP_SHARED, MAP_PRIVATE, MAP_32BIT, MAP_ANONYMOUS, MAP_DENYWRITE, M mremap_flags = MREMAP_MAYMOVE, MREMAP_FIXED mbind_mode = MPOL_DEFAULT, MPOL_BIND, MPOL_INTERLEAVE, MPOL_PREFERRED, MPOL_F_STATIC_NODES, MPOL_F_RELATIVE_NODES mbind_flags = MPOL_MF_STRICT, MPOL_MF_MOVE, MPOL_MF_MOVE_ALL -memfd_flags = MFD_CLOEXEC, MFD_ALLOW_SEALING +memfd_flags = MFD_CLOEXEC, MFD_ALLOW_SEALING, MFD_HUGETLB pipe_flags = O_NONBLOCK, O_CLOEXEC, O_DIRECT mlock_flags = MLOCK_ONFAULT mlockall_flags = MCL_CURRENT, MCL_FUTURE, MCL_ONFAULT diff --git a/sys/linux/sys_386.const b/sys/linux/sys_386.const index 800f0064b..c1204c962 100644 --- a/sys/linux/sys_386.const +++ b/sys/linux/sys_386.const @@ -268,6 +268,7 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64 MFD_ALLOW_SEALING = 2 MFD_CLOEXEC = 1 +MFD_HUGETLB = 4 MLOCK_ONFAULT = 1 MMAP_PAGE_ZERO = 1048576 MODULE_INIT_IGNORE_MODVERSIONS = 1 diff --git a/sys/linux/sys_amd64.const b/sys/linux/sys_amd64.const index 32aaa3cb0..5c7da4556 100644 --- a/sys/linux/sys_amd64.const +++ b/sys/linux/sys_amd64.const @@ -268,6 +268,7 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64 MFD_ALLOW_SEALING = 2 MFD_CLOEXEC = 1 +MFD_HUGETLB = 4 MLOCK_ONFAULT = 1 MMAP_PAGE_ZERO = 1048576 MODULE_INIT_IGNORE_MODVERSIONS = 1 diff --git a/sys/linux/sys_arm.const b/sys/linux/sys_arm.const index eecf7a27c..00a7962ce 100644 --- a/sys/linux/sys_arm.const +++ b/sys/linux/sys_arm.const @@ -268,6 +268,7 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64 MFD_ALLOW_SEALING = 2 MFD_CLOEXEC = 1 +MFD_HUGETLB = 4 MLOCK_ONFAULT = 1 MMAP_PAGE_ZERO = 1048576 MODULE_INIT_IGNORE_MODVERSIONS = 1 diff --git a/sys/linux/sys_arm64.const b/sys/linux/sys_arm64.const index a7269b3e1..9bb3daa1c 100644 --- a/sys/linux/sys_arm64.const +++ b/sys/linux/sys_arm64.const @@ -268,6 +268,7 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64 MFD_ALLOW_SEALING = 2 MFD_CLOEXEC = 1 +MFD_HUGETLB = 4 MLOCK_ONFAULT = 1 MMAP_PAGE_ZERO = 1048576 MODULE_INIT_IGNORE_MODVERSIONS = 1 diff --git a/sys/linux/sys_ppc64le.const b/sys/linux/sys_ppc64le.const index 760658b7e..2aa284b1d 100644 --- a/sys/linux/sys_ppc64le.const +++ b/sys/linux/sys_ppc64le.const @@ -268,6 +268,7 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 16 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 64 MFD_ALLOW_SEALING = 2 MFD_CLOEXEC = 1 +MFD_HUGETLB = 4 MLOCK_ONFAULT = 1 MMAP_PAGE_ZERO = 1048576 MODULE_INIT_IGNORE_MODVERSIONS = 1 -- cgit mrf-deployment