[PATCH 1/9] mm: make mlockall preserve flags other than VM_LOCKED in def_flags

[PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2012-12-21
[PATCH 1/9] mm: make mlockall preserve flags other than VM_LOCKED in def_flags · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 1/9] mm: make mlockall preserve flags other than VM_LOCKED in def_flags · Rik van Riel <hidden> · 2012-12-22
[PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Rik van Riel <hidden> · 2013-01-03
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Tommi Rantala <hidden> · 2013-03-10
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Andrew Morton <akpm@linux-foundation.org> · 2013-03-11
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Michel Lespinasse <hidden> · 2013-03-12
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Hillf Danton <hidden> · 2013-03-12
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Michel Lespinasse <hidden> · 2013-03-12
Re: [PATCH 4/9] mm: use mm_populate() for blocking remap_file_pages() · Andrew Morton <akpm@linux-foundation.org> · 2013-03-12
[PATCH 3/9] mm: introduce mm_populate() for populating new vmas · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 3/9] mm: introduce mm_populate() for populating new vmas · Rik van Riel <hidden> · 2013-01-03
[PATCH 5/9] mm: use mm_populate() when adjusting brk with MCL_FUTURE in effect. · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 5/9] mm: use mm_populate() when adjusting brk with MCL_FUTURE in effect. · Rik van Riel <hidden> · 2013-01-03
[PATCH 6/9] mm: use mm_populate() for mremap() of VM_LOCKED vmas · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 6/9] mm: use mm_populate() for mremap() of VM_LOCKED vmas · Rik van Riel <hidden> · 2013-01-03
[PATCH 7/9] mm: remove flags argument to mmap_region · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 7/9] mm: remove flags argument to mmap_region · Rik van Riel <hidden> · 2013-01-03
[PATCH 8/9] mm: directly use __mlock_vma_pages_range() in find_extend_vma() · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 8/9] mm: directly use __mlock_vma_pages_range() in find_extend_vma() · Rik van Riel <hidden> · 2013-01-03
[PATCH 2/9] mm: remap_file_pages() fixes · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 2/9] mm: remap_file_pages() fixes · Rik van Riel <hidden> · 2013-01-03
[PATCH 9/9] mm: introduce VM_POPULATE flag to better deal with racy userspace programs · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 9/9] mm: introduce VM_POPULATE flag to better deal with racy userspace programs · Rik van Riel <hidden> · 2013-01-03
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2012-12-21
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Greg Ungerer <hidden> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Greg Ungerer <hidden> · 2013-01-23
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Andy Lutomirski <luto@amacapital.net> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Andy Lutomirski <luto@amacapital.net> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Andy Lutomirski <luto@amacapital.net> · 2012-12-22
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2012-12-22
[PATCH 10/9] mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool · Michel Lespinasse <hidden> · 2012-12-22
Re: [PATCH 10/9] mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool · Rik van Riel <hidden> · 2013-01-03
Re: [PATCH 10/9] mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool · Andy Lutomirski <luto@amacapital.net> · 2013-01-03
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Andy Lutomirski <luto@amacapital.net> · 2013-01-03
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Andy Lutomirski <luto@amacapital.net> · 2013-01-04
Re: [PATCH 0/9] Avoid populating unbounded num of ptes with mmap_sem held · Michel Lespinasse <hidden> · 2013-01-04

STALE4854d

From: Michel Lespinasse <hidden>
Date: 2012-12-21 00:50:27
Also in: lkml
Subsystem: memory management, memory mapping, the rest · Maintainers: Andrew Morton, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds

On most architectures, def_flags is either 0 or VM_LOCKED depending on
whether mlockall(MCL_FUTURE) was called. However, this is not an absolute
rule as kvm support on s390 may set the VM_NOHUGEPAGE flag in def_flags.
We don't want mlockall to clear that.

Signed-off-by: Michel Lespinasse <redacted>

---
 mm/mlock.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/mlock.c b/mm/mlock.c
index f0b9ce572fc7..a2ee45c030fa 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c

@@ -517,10 +517,11 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
 static int do_mlockall(int flags)
 {
 	struct vm_area_struct * vma, * prev = NULL;
-	unsigned int def_flags = 0;
+	unsigned int def_flags;
 
+	def_flags = current->mm->def_flags & ~VM_LOCKED;
 	if (flags & MCL_FUTURE)
-		def_flags = VM_LOCKED;
+		def_flags |= VM_LOCKED;
 	current->mm->def_flags = def_flags;
 	if (flags == MCL_FUTURE)
 		goto out;

-- 
1.7.7.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help