| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <71b8817f-c779-4612-be65-c665a42c44b1@lucifer.local>
Date: Wed, 9 Oct 2024 15:16:32 +0100
From: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
To: Arnd Bergmann <arnd@...nel.org>
Cc: linux-mm@...ck.org, Arnd Bergmann <arnd@...db.de>,
"Jason A. Donenfeld" <Jason@...c4.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Andreas Larsson <andreas@...sler.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Ard Biesheuvel <ardb@...nel.org>,
Christian Brauner <brauner@...nel.org>, Christoph Hellwig <hch@....de>,
Christophe Leroy <christophe.leroy@...roup.eu>,
Damien Le Moal <dlemoal@...nel.org>,
David Hildenbrand <david@...hat.com>,
Greg Ungerer <gerg@...ux-m68k.org>, Helge Deller <deller@....de>,
Kees Cook <kees@...nel.org>,
"Liam R . Howlett" <Liam.Howlett@...cle.com>,
Matt Turner <mattst88@...il.com>, Max Filippov <jcmvbkbc@...il.com>,
Michael Ellerman <mpe@...erman.id.au>, Michal Hocko <mhocko@...e.com>,
Nicholas Piggin <npiggin@...il.com>,
Richard Henderson <richard.henderson@...aro.org>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Vladimir Murzin <vladimir.murzin@....com>,
Vlastimil Babka <vbabka@...e.cz>,
linux-stm32@...md-mailman.stormreply.com, linux-kernel@...r.kernel.org,
linux-mips@...r.kernel.org, linux-parisc@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-arch@...r.kernel.org
Subject: Re: [PATCH 1/5] asm-generic: cosmetic updates to uapi/asm/mman.h
On Wed, Sep 25, 2024 at 09:06:11PM +0000, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
>
> All but four architectures use asm-generic/mman-common.h, and the
> differences between these are mostly accidental. Rearrange them
> slightly to make it possible to 'vimdiff' them to see the actual
> relevant differences:
>
> - Move MADV_HWPOISON/MADV_SOFT_OFFLINE to the end of the list
> and ensure that all architectures include definitions
>
> - Use the exact same amount of whitespace and leading digits
> in each architecture
>
> - Synchronize comments, replacing historic defines that were
> never used with appropriate comments
>
> - explicitly point out MAP_SYNC and MAP_UNINITIALIZED as
> unsupported
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
(Apologies for delay in response!)
Notwithstanding Helge's comments, this looks good to me - thanks very much
for taking a look at this!)
Acked-by: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
> ---
> arch/alpha/include/uapi/asm/mman.h | 53 ++++++++++++-------
> arch/mips/include/uapi/asm/mman.h | 72 ++++++++++++--------------
> arch/parisc/include/uapi/asm/mman.h | 50 +++++++++++-------
> arch/xtensa/include/uapi/asm/mman.h | 61 ++++++++++------------
> include/uapi/asm-generic/mman-common.h | 8 ++-
> 5 files changed, 129 insertions(+), 115 deletions(-)
>
> diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h
> index 763929e814e9..8946a13ce858 100644
> --- a/arch/alpha/include/uapi/asm/mman.h
> +++ b/arch/alpha/include/uapi/asm/mman.h
> @@ -6,6 +6,8 @@
> #define PROT_WRITE 0x2 /* page can be written */
> #define PROT_EXEC 0x4 /* page can be executed */
> #define PROT_SEM 0x8 /* page may be used for atomic ops */
> +/* 0x10 reserved for arch-specific use */
> +/* 0x20 reserved for arch-specific use */
> #define PROT_NONE 0x0 /* page can not be accessed */
> #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
> #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
> @@ -15,41 +17,49 @@
> #define MAP_FIXED 0x100 /* Interpret addr exactly */
> #define MAP_ANONYMOUS 0x10 /* don't use a file */
>
> -/* not used by linux, but here to make sure we don't clash with OSF/1 defines */
> -#define _MAP_HASSEMAPHORE 0x0200
> -#define _MAP_INHERIT 0x0400
> -#define _MAP_UNALIGNED 0x0800
> -
> -/* These are linux-specific */
> -#define MAP_GROWSDOWN 0x01000 /* stack-like segment */
> -#define MAP_DENYWRITE 0x02000 /* ETXTBSY */
> -#define MAP_EXECUTABLE 0x04000 /* mark it as an executable */
> -#define MAP_LOCKED 0x08000 /* lock the mapping */
> +/* 0x200 through 0x800 originally for OSF-1 compat */
> +#define MAP_GROWSDOWN 0x1000 /* stack-like segment */
> +#define MAP_DENYWRITE 0x2000 /* ETXTBSY */
> +#define MAP_EXECUTABLE 0x4000 /* mark it as an executable */
> +#define MAP_LOCKED 0x8000 /* pages are locked */
> #define MAP_NORESERVE 0x10000 /* don't check for reservations */
> -#define MAP_POPULATE 0x20000 /* populate (prefault) pagetables */
> -#define MAP_NONBLOCK 0x40000 /* do not block on IO */
> -#define MAP_STACK 0x80000 /* give out an address that is best suited for process/thread stacks */
> -#define MAP_HUGETLB 0x100000 /* create a huge page mapping */
> +
> +#define MAP_POPULATE 0x020000 /* populate (prefault) pagetables */
> +#define MAP_NONBLOCK 0x040000 /* do not block on IO */
> +#define MAP_STACK 0x080000 /* give out an address that is best suited for process/thread stacks */
> +#define MAP_HUGETLB 0x100000 /* create a huge page mapping */
> +/* MAP_SYNC not supported */
> #define MAP_FIXED_NOREPLACE 0x200000/* MAP_FIXED which doesn't unmap underlying mapping */
>
> -#define MS_ASYNC 1 /* sync memory asynchronously */
> -#define MS_SYNC 2 /* synchronous memory sync */
> -#define MS_INVALIDATE 4 /* invalidate the caches */
> +/* MAP_UNINITIALIZED not supported */
>
> +/*
> + * Flags for mlockall
> + */
> #define MCL_CURRENT 8192 /* lock all currently mapped pages */
> #define MCL_FUTURE 16384 /* lock all additions to address space */
> #define MCL_ONFAULT 32768 /* lock all pages that are faulted in */
>
> +/*
> + * Flags for mlock
> + */
> #define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
>
> +/*
> + * Flags for msync
> + */
> +#define MS_ASYNC 1 /* sync memory asynchronously */
> +#define MS_SYNC 2 /* synchronous memory sync */
> +#define MS_INVALIDATE 4 /* invalidate the caches */
> +
> #define MADV_NORMAL 0 /* no further special treatment */
> #define MADV_RANDOM 1 /* expect random page references */
> #define MADV_SEQUENTIAL 2 /* expect sequential page references */
> #define MADV_WILLNEED 3 /* will need these pages */
> -#define MADV_SPACEAVAIL 5 /* ensure resources are available */
> #define MADV_DONTNEED 6 /* don't need these pages */
> +/* originally MADV_SPACEAVAIL 5 */
>
> -/* common/generic parameters */
> +/* common parameters: try to keep these consistent across architectures */
> #define MADV_FREE 8 /* free pages only if memory pressure */
> #define MADV_REMOVE 9 /* remove these pages & resources */
> #define MADV_DONTFORK 10 /* don't inherit across fork */
> @@ -63,7 +73,7 @@
>
> #define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
> overrides the coredump filter bits */
> -#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
> +#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */
>
> #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
> #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
> @@ -78,6 +88,9 @@
>
> #define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */
>
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
> +
> /* compatibility flags */
> #define MAP_FILE 0
>
> diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h
> index 9c48d9a21aa0..399937cefaa6 100644
> --- a/arch/mips/include/uapi/asm/mman.h
> +++ b/arch/mips/include/uapi/asm/mman.h
> @@ -9,53 +9,36 @@
> #ifndef _ASM_MMAN_H
> #define _ASM_MMAN_H
>
> -/*
> - * Protections are chosen from these bits, OR'd together. The
> - * implementation does not necessarily support PROT_EXEC or PROT_WRITE
> - * without PROT_READ. The only guarantees are that no writing will be
> - * allowed without PROT_WRITE and no access will be allowed for PROT_NONE.
> - */
> -#define PROT_NONE 0x00 /* page can not be accessed */
> -#define PROT_READ 0x01 /* page can be read */
> -#define PROT_WRITE 0x02 /* page can be written */
> -#define PROT_EXEC 0x04 /* page can be executed */
> -/* 0x08 reserved for PROT_EXEC_NOFLUSH */
> +#define PROT_READ 0x1 /* page can be read */
> +#define PROT_WRITE 0x2 /* page can be written */
> +#define PROT_EXEC 0x4 /* page can be executed */
> +/* 0x8 reserved for PROT_EXEC_NOFLUSH */
> #define PROT_SEM 0x10 /* page may be used for atomic ops */
> +/* 0x20 reserved for arch-specific use */
> +#define PROT_NONE 0x0 /* page can not be accessed */
> #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
> #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
>
> -/*
> - * Flags for mmap
> - */
> /* 0x01 - 0x03 are defined in linux/mman.h */
> -#define MAP_TYPE 0x00f /* Mask for type of mapping */
> -#define MAP_FIXED 0x010 /* Interpret addr exactly */
> +#define MAP_TYPE 0x0f /* Mask for type of mapping */
> +#define MAP_FIXED 0x10 /* Interpret addr exactly */
>
> -/* not used by linux, but here to make sure we don't clash with ABI defines */
> -#define MAP_RENAME 0x020 /* Assign page to file */
> -#define MAP_AUTOGROW 0x040 /* File may grow by writing */
> -#define MAP_LOCAL 0x080 /* Copy on fork/sproc */
> -#define MAP_AUTORSRV 0x100 /* Logical swap reserved on demand */
> -
> -/* These are linux-specific */
> +/* 0x20 through 0x100 originally reserved for other unix compat */
> #define MAP_NORESERVE 0x0400 /* don't check for reservations */
> #define MAP_ANONYMOUS 0x0800 /* don't use a file */
> #define MAP_GROWSDOWN 0x1000 /* stack-like segment */
> #define MAP_DENYWRITE 0x2000 /* ETXTBSY */
> #define MAP_EXECUTABLE 0x4000 /* mark it as an executable */
> #define MAP_LOCKED 0x8000 /* pages are locked */
> -#define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */
> -#define MAP_NONBLOCK 0x20000 /* do not block on IO */
> -#define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */
> -#define MAP_HUGETLB 0x80000 /* create a huge page mapping */
> -#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
>
> -/*
> - * Flags for msync
> - */
> -#define MS_ASYNC 0x0001 /* sync memory asynchronously */
> -#define MS_INVALIDATE 0x0002 /* invalidate mappings & caches */
> -#define MS_SYNC 0x0004 /* synchronous memory sync */
> +#define MAP_POPULATE 0x010000 /* populate (prefault) pagetables */
> +#define MAP_NONBLOCK 0x020000 /* do not block on IO */
> +#define MAP_STACK 0x040000 /* give out an address that is best suited for process/thread stacks */
> +#define MAP_HUGETLB 0x080000 /* create a huge page mapping */
> +/* MAP_SYNC not supported */
> +#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
> +
> +/* MAP_UNINITIALIZED not supported */
>
> /*
> * Flags for mlockall
> @@ -69,9 +52,16 @@
> */
> #define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
>
> +/*
> + * Flags for msync
> + */
> +#define MS_ASYNC 1 /* sync memory asynchronously */
> +#define MS_INVALIDATE 2 /* invalidate the caches */
> +#define MS_SYNC 4 /* synchronous memory sync */
> +
> #define MADV_NORMAL 0 /* no further special treatment */
> #define MADV_RANDOM 1 /* expect random page references */
> -#define MADV_SEQUENTIAL 2 /* expect sequential page references */
> +#define MADV_SEQUENTIAL 2 /* expect sequential page references */
> #define MADV_WILLNEED 3 /* will need these pages */
> #define MADV_DONTNEED 4 /* don't need these pages */
>
> @@ -81,16 +71,15 @@
> #define MADV_DONTFORK 10 /* don't inherit across fork */
> #define MADV_DOFORK 11 /* do inherit across fork */
>
> -#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
> +#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
> #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */
> -#define MADV_HWPOISON 100 /* poison a page for testing */
>
> #define MADV_HUGEPAGE 14 /* Worth backing with hugepages */
> -#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
> +#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
>
> -#define MADV_DONTDUMP 16 /* Explicitly exclude from core dump,
> +#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
> overrides the coredump filter bits */
> -#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
> +#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */
>
> #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
> #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
> @@ -105,6 +94,9 @@
>
> #define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */
>
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
> +
> /* compatibility flags */
> #define MAP_FILE 0
>
> diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h
> index 68c44f99bc93..80f4a55763a0 100644
> --- a/arch/parisc/include/uapi/asm/mman.h
> +++ b/arch/parisc/include/uapi/asm/mman.h
> @@ -6,6 +6,8 @@
> #define PROT_WRITE 0x2 /* page can be written */
> #define PROT_EXEC 0x4 /* page can be executed */
> #define PROT_SEM 0x8 /* page may be used for atomic ops */
> +/* 0x10 reserved for arch-specific use */
> +/* 0x20 reserved for arch-specific use */
> #define PROT_NONE 0x0 /* page can not be accessed */
> #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
> #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
> @@ -20,30 +22,42 @@
> #define MAP_LOCKED 0x2000 /* pages are locked */
> #define MAP_NORESERVE 0x4000 /* don't check for reservations */
> #define MAP_GROWSDOWN 0x8000 /* stack-like segment */
> -#define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */
> -#define MAP_NONBLOCK 0x20000 /* do not block on IO */
> -#define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */
> -#define MAP_HUGETLB 0x80000 /* create a huge page mapping */
> -#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
> -#define MAP_UNINITIALIZED 0 /* uninitialized anonymous mmap */
>
> -#define MS_SYNC 1 /* synchronous memory sync */
> -#define MS_ASYNC 2 /* sync memory asynchronously */
> -#define MS_INVALIDATE 4 /* invalidate the caches */
> +#define MAP_POPULATE 0x010000 /* populate (prefault) pagetables */
> +#define MAP_NONBLOCK 0x020000 /* do not block on IO */
> +#define MAP_STACK 0x040000 /* give out an address that is best suited for process/thread stacks */
> +#define MAP_HUGETLB 0x080000 /* create a huge page mapping */
> +/* MAP_SYNC not supported */
> +#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
> +
> +/* MAP_UNINITIALIZED not supported */
>
> +/*
> + * Flags for mlockall
> + */
> #define MCL_CURRENT 1 /* lock all current mappings */
> #define MCL_FUTURE 2 /* lock all future mappings */
> #define MCL_ONFAULT 4 /* lock all pages that are faulted in */
>
> +/*
> + * Flags for mlock
> + */
> #define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
>
> -#define MADV_NORMAL 0 /* no further special treatment */
> -#define MADV_RANDOM 1 /* expect random page references */
> -#define MADV_SEQUENTIAL 2 /* expect sequential page references */
> -#define MADV_WILLNEED 3 /* will need these pages */
> -#define MADV_DONTNEED 4 /* don't need these pages */
> +/*
> + * Flags for msync
> + */
> +#define MS_SYNC 1 /* synchronous memory sync */
> +#define MS_ASYNC 2 /* sync memory asynchronously */
> +#define MS_INVALIDATE 4 /* invalidate the caches */
> +
> +#define MADV_NORMAL 0 /* no further special treatment */
> +#define MADV_RANDOM 1 /* expect random page references */
> +#define MADV_SEQUENTIAL 2 /* expect sequential page references */
> +#define MADV_WILLNEED 3 /* will need these pages */
> +#define MADV_DONTNEED 4 /* don't need these pages */
>
> -/* common/generic parameters */
> +/* common parameters: try to keep these consistent across architectures */
> #define MADV_FREE 8 /* free pages only if memory pressure */
> #define MADV_REMOVE 9 /* remove these pages & resources */
> #define MADV_DONTFORK 10 /* don't inherit across fork */
> @@ -53,11 +67,11 @@
> #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */
>
> #define MADV_HUGEPAGE 14 /* Worth backing with hugepages */
> -#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
> +#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
>
> #define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
> overrides the coredump filter bits */
> -#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
> +#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */
>
> #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
> #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
> @@ -72,7 +86,7 @@
>
> #define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */
>
> -#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> #define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
>
> /* compatibility flags */
> diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h
> index 1ff0c858544f..ad6bc56a7aef 100644
> --- a/arch/xtensa/include/uapi/asm/mman.h
> +++ b/arch/xtensa/include/uapi/asm/mman.h
> @@ -15,57 +15,38 @@
> #ifndef _XTENSA_MMAN_H
> #define _XTENSA_MMAN_H
>
> -/*
> - * Protections are chosen from these bits, OR'd together. The
> - * implementation does not necessarily support PROT_EXEC or PROT_WRITE
> - * without PROT_READ. The only guarantees are that no writing will be
> - * allowed without PROT_WRITE and no access will be allowed for PROT_NONE.
> - */
> -
> -#define PROT_NONE 0x0 /* page can not be accessed */
> #define PROT_READ 0x1 /* page can be read */
> #define PROT_WRITE 0x2 /* page can be written */
> #define PROT_EXEC 0x4 /* page can be executed */
> -
> +/* 0x8 reserved for arch-specific use */
> #define PROT_SEM 0x10 /* page may be used for atomic ops */
> +/* 0x20 reserved for arch-specific use */
> +#define PROT_NONE 0x0 /* page can not be accessed */
> #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
> -#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end fo growsup vma */
> +#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
>
> -/*
> - * Flags for mmap
> - */
> /* 0x01 - 0x03 are defined in linux/mman.h */
> -#define MAP_TYPE 0x00f /* Mask for type of mapping */
> -#define MAP_FIXED 0x010 /* Interpret addr exactly */
> +#define MAP_TYPE 0x0f /* Mask for type of mapping */
> +#define MAP_FIXED 0x10 /* Interpret addr exactly */
>
> -/* not used by linux, but here to make sure we don't clash with ABI defines */
> -#define MAP_RENAME 0x020 /* Assign page to file */
> -#define MAP_AUTOGROW 0x040 /* File may grow by writing */
> -#define MAP_LOCAL 0x080 /* Copy on fork/sproc */
> -#define MAP_AUTORSRV 0x100 /* Logical swap reserved on demand */
> -
> -/* These are linux-specific */
> +/* 0x20 through 0x100 originally reserved for other unix compat */
> #define MAP_NORESERVE 0x0400 /* don't check for reservations */
> #define MAP_ANONYMOUS 0x0800 /* don't use a file */
> #define MAP_GROWSDOWN 0x1000 /* stack-like segment */
> #define MAP_DENYWRITE 0x2000 /* ETXTBSY */
> #define MAP_EXECUTABLE 0x4000 /* mark it as an executable */
> #define MAP_LOCKED 0x8000 /* pages are locked */
> -#define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */
> -#define MAP_NONBLOCK 0x20000 /* do not block on IO */
> -#define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */
> -#define MAP_HUGETLB 0x80000 /* create a huge page mapping */
> -#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
> +
> +#define MAP_POPULATE 0x010000 /* populate (prefault) pagetables */
> +#define MAP_NONBLOCK 0x020000 /* do not block on IO */
> +#define MAP_STACK 0x040000 /* give out an address that is best suited for process/thread stacks */
> +#define MAP_HUGETLB 0x080000 /* create a huge page mapping */
> +/* MAP_SYNC not supported */
> +#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
> +
> #define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be
> * uninitialized */
>
> -/*
> - * Flags for msync
> - */
> -#define MS_ASYNC 0x0001 /* sync memory asynchronously */
> -#define MS_INVALIDATE 0x0002 /* invalidate mappings & caches */
> -#define MS_SYNC 0x0004 /* synchronous memory sync */
> -
> /*
> * Flags for mlockall
> */
> @@ -78,6 +59,13 @@
> */
> #define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
>
> +/*
> + * Flags for msync
> + */
> +#define MS_ASYNC 1 /* sync memory asynchronously */
> +#define MS_INVALIDATE 2 /* invalidate the caches */
> +#define MS_SYNC 4 /* synchronous memory sync */
> +
> #define MADV_NORMAL 0 /* no further special treatment */
> #define MADV_RANDOM 1 /* expect random page references */
> #define MADV_SEQUENTIAL 2 /* expect sequential page references */
> @@ -98,7 +86,7 @@
>
> #define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
> overrides the coredump filter bits */
> -#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
> +#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */
>
> #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
> #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
> @@ -113,6 +101,9 @@
>
> #define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */
>
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
> +
> /* compatibility flags */
> #define MAP_FILE 0
>
> diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
> index 6ce1f1ceb432..792ad5599d9c 100644
> --- a/include/uapi/asm-generic/mman-common.h
> +++ b/include/uapi/asm-generic/mman-common.h
> @@ -38,6 +38,9 @@
> */
> #define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
>
> +/*
> + * Flags for msync
> + */
> #define MS_ASYNC 1 /* sync memory asynchronously */
> #define MS_INVALIDATE 2 /* invalidate the caches */
> #define MS_SYNC 4 /* synchronous memory sync */
> @@ -53,8 +56,6 @@
> #define MADV_REMOVE 9 /* remove these pages & resources */
> #define MADV_DONTFORK 10 /* don't inherit across fork */
> #define MADV_DOFORK 11 /* do inherit across fork */
> -#define MADV_HWPOISON 100 /* poison a page for testing */
> -#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
>
> #define MADV_MERGEABLE 12 /* KSM may merge identical pages */
> #define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */
> @@ -79,6 +80,9 @@
>
> #define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */
>
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
> +
> /* compatibility flags */
> #define MAP_FILE 0
>
> --
> 2.39.2
>
Powered by blists - more mailing lists