add MAP_UNLOCKED mmap flag
Subsystems (10)
PATCH v4 1/1 add MAP_UNLOCKED mmap flag
If application does mlockall(MCL_FUTURE) it is no longer possible to mmap file bigger than main memory or allocate big area of anonymous memory in a thread safe manner. Sometimes it is desirable to lock everything related to program execution into memory, but still be able to mmap big file or allocate huge amount of memory and allow OS to swap them on demand. MAP_UNLOCKED allows to do that.
---
I get reports that people find this useful, so resending.
v1->v2
- adding new flag to all archs
- fixing typo
v2->v3
- one more typo fix
v3->v4
- return error if MAP_LOCKED | MAP_UNLOCKED is specified
arch/alpha/include/asm/mman.h +1 -0
@@ -30,6 +30,7 @@#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_UNLOCKED 0x200000/* force page unlocking */ #define MS_ASYNC 1/* sync memory asynchronously */ #define MS_SYNC 2/* synchronous memory sync */
arch/mips/include/asm/mman.h +1 -0
@@ -48,6 +48,7 @@#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_UNLOCKED 0x100000/* force page unlocking */ /* * Flags for msync
arch/parisc/include/asm/mman.h +1 -0
@@ -24,6 +24,7 @@#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_UNLOCKED 0x100000/* force page unlocking */ #define MS_SYNC 1/* synchronous memory sync */ #define MS_ASYNC 2/* sync memory asynchronously */
arch/powerpc/include/asm/mman.h +1 -0
@@ -27,6 +27,7 @@#define MAP_NONBLOCK 0x10000/* do not block on IO */ #define MAP_STACK 0x20000/* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000/* create a huge page mapping */ +#define MAP_UNLOCKED 0x80000/* force page unlocking */ #ifdef __KERNEL__#ifdef CONFIG_PPC64
arch/sparc/include/asm/mman.h +1 -0
@@ -22,6 +22,7 @@#define MAP_NONBLOCK 0x10000/* do not block on IO */ #define MAP_STACK 0x20000/* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000/* create a huge page mapping */ +#define MAP_UNLOCKED 0x80000/* force page unlocking */ #ifdef __KERNEL__#ifndef __ASSEMBLY__
arch/xtensa/include/asm/mman.h +1 -0
@@ -55,6 +55,7 @@#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_UNLOCKED 0x100000/* force page unlocking */ /* * Flags for msync
include/asm-generic/mman.h +1 -0
@@ -12,6 +12,7 @@#define MAP_NONBLOCK 0x10000/* do not block on IO */ #define MAP_STACK 0x20000/* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000/* create a huge page mapping */ +#define MAP_UNLOCKED 0x80000/* force page unlocking */ #define MCL_CURRENT 1/* lock all current mappings */ #define MCL_FUTURE 2/* lock all future mappings */
mm/mmap.c +6 -0
@@ -962,6 +962,12 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,if (!can_do_mlock ())return -EPERM ; +if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; + +if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; +/* mlock MCL_FUTURE? */ if (vm_flags &VM_LOCKED ) {unsigned long locked, lock_limit;
--
Gleb.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 2 lines · * Gleb Natapov ([email protected]) wrote:
v3->v4
- return error ifMAP_LOCKED|MAP_UNLOCKEDis specified
...
Quoted 5 lines
mm/mmap.c +0
-0@@ -962,6 +962,12 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,if (!can_do_mlock ())return -EPERM ;
mm/mmap.c unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, · line 973
Quoted 10 lines
mm/mmap.c +6
-0+if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; + +if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; +/* mlock MCL_FUTURE? */ if (vm_flags &VM_LOCKED ) {unsigned long locked, lock_limit;
Looks like same patch applied twice rather than adding the (MAP_LOCKED | MAP_UNLOCKED) check.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 10 lines · Chris Wright
Quoted 2 lines · * Gleb Natapov ([email protected]) wrote:
v3->v4
- return error ifMAP_LOCKED|MAP_UNLOCKEDis specified...
Quoted 6 lines
mm/mmap.c +0
-0@@ -962,6 +962,12 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,if (!can_do_mlock ())return -EPERM ;
Quoted 13 lines
mm/mmap.c unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, · line 973
Quoted 9 lines
mm/mmap.c +6
-0+if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; + +if (flags &MAP_UNLOCKED ) + vm_flags &= ~VM_LOCKED ; +/* mlock MCL_FUTURE? */ if (vm_flags &VM_LOCKED ) {unsigned long locked, lock_limit;Looks like same patch applied twice rather than adding the (
MAP_LOCKED|MAP_UNLOCKED) check.
Thanks Chris, will resend.
--
Gleb.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>