MAP_NOZERO v2 - implement sys_brk2()
Subsystems (4)
PATCH 2/4 MAP_NOZERO v2 - implement sys_brk2()
The following patch implements the sys_brk2() syscall, that nothing is other than a sys_brk() with an extra "flags" parameter. This can be used to pass the new MAP_NOZERO bit, to ask the kernel to hand over non-zero pages if possible.
Signed-off-by Davide Libenzi <[email protected]>
- Davide
--- include/linux/mm.h | 3 ++- include/linux/syscalls.h | 1 + mm/mmap.c | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-)
include/linux/mm.h +2 -1
@@ -1114,7 +1114,8 @@ }extern int do_munmap (struct mm_struct *,unsigned long ,size_t ); - +extern unsigned long do_brk_flags (unsigned long addr,unsigned long len, +unsigned long vmflags);extern unsigned long do_brk (unsigned long ,unsigned long );/* filemap.c */
include/linux/syscalls.h +1 -0
@@ -263,6 +263,7 @@asmlinkage long sys_fremovexattr (int fd,char __user *name);asmlinkage unsigned long sys_brk (unsigned long brk); +asmlinkage unsigned long sys_brk2 (unsigned long brk,unsigned long flags);asmlinkage long sys_mprotect (unsigned long start,size_t len,unsigned long prot); asmlinkage unsigned long sys_mremap(unsigned long addr,
mm/mmap.c +18 -4
@@ -35,6 +35,8 @@#define arch_mmap_check (addr, len, flags) (0)#endif +#define BRK_ALLOWED_FLAGS (VM_NOZERO) +static void unmap_region (struct mm_struct *mm,struct vm_area_struct *vma,struct vm_area_struct *prev,unsigned long start,unsigned long end);
@@ -234,7 +236,7 @@return next; } -asmlinkage unsigned long sys_brk (unsigned long brk) +asmlinkage unsigned long sys_brk2 (unsigned long brk,unsigned long flags) {unsigned long rlim, retval;unsigned long newbrk, oldbrk;
@@ -271,8 +273,10 @@if (find_vma_intersection (mm, oldbrk, newbrk+PAGE_SIZE )) goto out; + flags =BRK_ALLOWED_FLAGS &calc_vm_flag_bits (flags); +/* Ok, looks good - let it rip. */ -if (do_brk (oldbrk, newbrk-oldbrk) != oldbrk) +if (do_brk_flags (oldbrk, newbrk-oldbrk, flags) != oldbrk) goto out; set_brk: mm->brk = brk;
@@ -282,6 +286,11 @@return retval; } +asmlinkage unsigned long sys_brk (unsigned long brk) +{ +return sys_brk2 (brk,0 ); +} +#ifdef DEBUG_MM_RB static int browse_rb (struct rb_root *root) {
@@ -1868,7 +1877,8 @@* anonymous maps. eventually we may be able to do some * brk-specific accounting here. */ -unsigned long do_brk (unsigned long addr,unsigned long len) +unsigned long do_brk_flags (unsigned long addr,unsigned long len, +unsigned long vmflags) {struct mm_struct * mm = current->mm;struct vm_area_struct * vma, * prev;
@@ -1887,7 +1897,7 @@if (is_hugepage_only_range (mm, addr, len))return -EINVAL ; - flags =VM_DATA_DEFAULT_FLAGS |VM_ACCOUNT | mm->def_flags; + flags =VM_DATA_DEFAULT_FLAGS |VM_ACCOUNT | mm->def_flags | vmflags; error =arch_mmap_check (addr, len, flags);if (error)
@@ -1964,6 +1974,10 @@return addr; } +unsigned long do_brk (unsigned long addr,unsigned long len) +{ +return do_brk_flags (addr, len,0 ); +}EXPORT_SYMBOL (do_brk);/* Release all mmaps. */