From edada2ecade8dc46cbbfb464aabccbec2cb9d18f Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 26 Mar 2020 12:31:41 -0400 Subject: sys/freebsd: add FreeBSD-specific madvise(2) flags --- executor/defs.h | 4 ++-- sys/freebsd/gen/386.go | 10 ++++++++-- sys/freebsd/gen/amd64.go | 10 ++++++++-- sys/freebsd/posix_mm.txt | 2 +- sys/freebsd/posix_mm_386.const | 6 ++++++ sys/freebsd/posix_mm_amd64.const | 6 ++++++ 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index 20cb0957a..a53a34028 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -20,7 +20,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "0f19b2f5552656baf8ed0bcfa136c87402cd6a60" +#define SYZ_REVISION "859d11e279ca221ebc432c9bd70aed2df0de00ae" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -30,7 +30,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "924df6a40b0ac61e354428a478eccfbfef5067fa" +#define SYZ_REVISION "f6edc842471e74f5620eb10327dc7a095ae28e49" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/freebsd/gen/386.go b/sys/freebsd/gen/386.go index cf7899f55..81010354d 100644 --- a/sys/freebsd/gen/386.go +++ b/sys/freebsd/gen/386.go @@ -3252,7 +3252,7 @@ var syscalls_386 = []*Syscall{ {NR: 75, Name: "madvise", CallName: "madvise", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 4}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Path: []string{"addr"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "madvise_flags", FldName: "advice", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "madvise_flags", FldName: "advice", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}, }}, {NR: 78, Name: "mincore", CallName: "mincore", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 4}}, @@ -5244,8 +5244,14 @@ var consts_386 = []ConstValue{ {"LOCK_NB", 4}, {"LOCK_SH", 1}, {"LOCK_UN", 8}, + {"MADV_AUTOSYNC", 7}, + {"MADV_CORE", 9}, {"MADV_DONTNEED", 4}, + {"MADV_FREE", 5}, + {"MADV_NOCORE", 8}, {Name: "MADV_NORMAL"}, + {"MADV_NOSYNC", 6}, + {"MADV_PROTECT", 10}, {"MADV_RANDOM", 1}, {"MADV_SEQUENTIAL", 2}, {"MADV_WILLNEED", 3}, @@ -5703,4 +5709,4 @@ var consts_386 = []ConstValue{ {"WUNTRACED", 2}, } -const revision_386 = "0f19b2f5552656baf8ed0bcfa136c87402cd6a60" +const revision_386 = "859d11e279ca221ebc432c9bd70aed2df0de00ae" diff --git a/sys/freebsd/gen/amd64.go b/sys/freebsd/gen/amd64.go index a154e2ccf..7695b0ef5 100644 --- a/sys/freebsd/gen/amd64.go +++ b/sys/freebsd/gen/amd64.go @@ -3279,7 +3279,7 @@ var syscalls_amd64 = []*Syscall{ {NR: 75, Name: "madvise", CallName: "madvise", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 8}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"addr"}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "madvise_flags", FldName: "advice", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "madvise_flags", FldName: "advice", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}, }}, {NR: 78, Name: "mincore", CallName: "mincore", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "addr", TypeSize: 8}}, @@ -5271,8 +5271,14 @@ var consts_amd64 = []ConstValue{ {"LOCK_NB", 4}, {"LOCK_SH", 1}, {"LOCK_UN", 8}, + {"MADV_AUTOSYNC", 7}, + {"MADV_CORE", 9}, {"MADV_DONTNEED", 4}, + {"MADV_FREE", 5}, + {"MADV_NOCORE", 8}, {Name: "MADV_NORMAL"}, + {"MADV_NOSYNC", 6}, + {"MADV_PROTECT", 10}, {"MADV_RANDOM", 1}, {"MADV_SEQUENTIAL", 2}, {"MADV_WILLNEED", 3}, @@ -5730,4 +5736,4 @@ var consts_amd64 = []ConstValue{ {"WUNTRACED", 2}, } -const revision_amd64 = "924df6a40b0ac61e354428a478eccfbfef5067fa" +const revision_amd64 = "f6edc842471e74f5620eb10327dc7a095ae28e49" diff --git a/sys/freebsd/posix_mm.txt b/sys/freebsd/posix_mm.txt index cf363e3b5..f7d868322 100644 --- a/sys/freebsd/posix_mm.txt +++ b/sys/freebsd/posix_mm.txt @@ -17,7 +17,7 @@ munlockall() mmap_prot = PROT_EXEC, PROT_READ, PROT_WRITE msync_flags = MS_ASYNC, MS_SYNC, MS_INVALIDATE mmap_flags = MAP_SHARED, MAP_PRIVATE, MAP_32BIT, MAP_ANONYMOUS, MAP_FILE, MAP_FIXED, MAP_STACK -madvise_flags = MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MADV_DONTNEED +madvise_flags = MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MADV_DONTNEED, MADV_FREE, MADV_NOSYNC, MADV_AUTOSYNC, MADV_NOCORE, MADV_CORE, MADV_PROTECT mlockall_flags = MCL_CURRENT, MCL_FUTURE define MAP_ANONYMOUS MAP_ANON diff --git a/sys/freebsd/posix_mm_386.const b/sys/freebsd/posix_mm_386.const index 234ee7125..715d91013 100644 --- a/sys/freebsd/posix_mm_386.const +++ b/sys/freebsd/posix_mm_386.const @@ -1,6 +1,12 @@ # AUTOGENERATED FILE +MADV_AUTOSYNC = 7 +MADV_CORE = 9 MADV_DONTNEED = 4 +MADV_FREE = 5 +MADV_NOCORE = 8 MADV_NORMAL = 0 +MADV_NOSYNC = 6 +MADV_PROTECT = 10 MADV_RANDOM = 1 MADV_SEQUENTIAL = 2 MADV_WILLNEED = 3 diff --git a/sys/freebsd/posix_mm_amd64.const b/sys/freebsd/posix_mm_amd64.const index 234ee7125..715d91013 100644 --- a/sys/freebsd/posix_mm_amd64.const +++ b/sys/freebsd/posix_mm_amd64.const @@ -1,6 +1,12 @@ # AUTOGENERATED FILE +MADV_AUTOSYNC = 7 +MADV_CORE = 9 MADV_DONTNEED = 4 +MADV_FREE = 5 +MADV_NOCORE = 8 MADV_NORMAL = 0 +MADV_NOSYNC = 6 +MADV_PROTECT = 10 MADV_RANDOM = 1 MADV_SEQUENTIAL = 2 MADV_WILLNEED = 3 -- cgit mrf-deployment