Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: prepare VM_DONTDUMP for using in drivers

Rename VM_NODUMP into VM_DONTDUMP: this name matches other negative flags:
VM_DONTEXPAND, VM_DONTCOPY. Currently this flag used only for
sys_madvise. The next patch will use it for replacing the outdated flag
VM_RESERVED.

Also forbid madvise(MADV_DODUMP) for special kernel mappings VM_SPECIAL
(VM_IO | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Carsten Otte <cotte@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Venkatesh Pallipadi <venki@google.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Konstantin Khlebnikov and committed by
Linus Torvalds
0103bd16 e9714acf

+8 -4
+1 -1
fs/binfmt_elf.c
··· 1123 1123 if (always_dump_vma(vma)) 1124 1124 goto whole; 1125 1125 1126 - if (vma->vm_flags & VM_NODUMP) 1126 + if (vma->vm_flags & VM_DONTDUMP) 1127 1127 return 0; 1128 1128 1129 1129 /* Hugetlb memory check */
+1 -1
include/linux/mm.h
··· 102 102 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ 103 103 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ 104 104 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */ 105 - #define VM_NODUMP 0x04000000 /* Do not include in the core dump */ 105 + #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */ 106 106 107 107 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ 108 108 #define VM_HUGEPAGE 0x20000000 /* MADV_HUGEPAGE marked this vma */
+6 -2
mm/madvise.c
··· 69 69 new_flags &= ~VM_DONTCOPY; 70 70 break; 71 71 case MADV_DONTDUMP: 72 - new_flags |= VM_NODUMP; 72 + new_flags |= VM_DONTDUMP; 73 73 break; 74 74 case MADV_DODUMP: 75 - new_flags &= ~VM_NODUMP; 75 + if (new_flags & VM_SPECIAL) { 76 + error = -EINVAL; 77 + goto out; 78 + } 79 + new_flags &= ~VM_DONTDUMP; 76 80 break; 77 81 case MADV_MERGEABLE: 78 82 case MADV_UNMERGEABLE: