[PATCH 6/9] mm: use mm_populate() for mremap() of VM_LOCKED vmas

[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

STALE4874d

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

Signed-off-by: Michel Lespinasse <redacted>

---
 mm/mremap.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index 1b61c2d3307a..c5a8bf344b1f 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c

@@ -208,7 +208,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
 
 static unsigned long move_vma(struct vm_area_struct *vma,
 		unsigned long old_addr, unsigned long old_len,
-		unsigned long new_len, unsigned long new_addr)
+		unsigned long new_len, unsigned long new_addr, bool *locked)
 {
 	struct mm_struct *mm = vma->vm_mm;
 	struct vm_area_struct *new_vma;

@@ -299,9 +299,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
 
 	if (vm_flags & VM_LOCKED) {
 		mm->locked_vm += new_len >> PAGE_SHIFT;
-		if (new_len > old_len)
-			mlock_vma_pages_range(new_vma, new_addr + old_len,
-						       new_addr + new_len);
+		*locked = true;
 	}
 
 	return new_addr;

@@ -366,9 +364,8 @@ Eagain:
 	return ERR_PTR(-EAGAIN);
 }
 
-static unsigned long mremap_to(unsigned long addr,
-	unsigned long old_len, unsigned long new_addr,
-	unsigned long new_len)
+static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
+		unsigned long new_addr, unsigned long new_len, bool *locked)
 {
 	struct mm_struct *mm = current->mm;
 	struct vm_area_struct *vma;

@@ -418,7 +415,7 @@ static unsigned long mremap_to(unsigned long addr,
 	if (ret & ~PAGE_MASK)
 		goto out1;
 
-	ret = move_vma(vma, addr, old_len, new_len, new_addr);
+	ret = move_vma(vma, addr, old_len, new_len, new_addr, locked);
 	if (!(ret & ~PAGE_MASK))
 		goto out;
 out1:

@@ -456,6 +453,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 	struct vm_area_struct *vma;
 	unsigned long ret = -EINVAL;
 	unsigned long charged = 0;
+	bool locked = false;
 
 	down_write(&current->mm->mmap_sem);

@@ -478,7 +476,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 
 	if (flags & MREMAP_FIXED) {
 		if (flags & MREMAP_MAYMOVE)
-			ret = mremap_to(addr, old_len, new_addr, new_len);
+			ret = mremap_to(addr, old_len, new_addr, new_len,
+					&locked);
 		goto out;
 	}

@@ -520,8 +519,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 			vm_stat_account(mm, vma->vm_flags, vma->vm_file, pages);
 			if (vma->vm_flags & VM_LOCKED) {
 				mm->locked_vm += pages;
-				mlock_vma_pages_range(vma, addr + old_len,
-						   addr + new_len);
+				locked = true;
+				new_addr = addr;
 			}
 			ret = addr;
 			goto out;

@@ -547,11 +546,13 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 			goto out;
 		}
 
-		ret = move_vma(vma, addr, old_len, new_len, new_addr);
+		ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
 	}
 out:
 	if (ret & ~PAGE_MASK)
 		vm_unacct_memory(charged);
 	up_write(&current->mm->mmap_sem);
+	if (locked && new_len > old_len)
+		mm_populate(new_addr + old_len, new_len - old_len);
 	return ret;
 }

-- 
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