* [folded-merged] mm-add-mremap_dontunmap-to-mremap-v6.patch removed from -mm tree
@ 2020-04-02 3:30 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-04-02 3:30 UTC (permalink / raw)
To: aarcange, arnd, bgeffon, fweimer, joel, jsbarnes, kirill,
lokeshgidra, luto, minchan, mm-commits, mst, natechancellor,
sonnyrao, vbabka, will, yuzhao
The patch titled
Subject: mm-add-mremap_dontunmap-to-mremap-v6
has been removed from the -mm tree. Its filename was
mm-add-mremap_dontunmap-to-mremap-v6.patch
This patch was dropped because it was folded into mm-add-mremap_dontunmap-to-mremap.patch
------------------------------------------------------
From: Brian Geffon <bgeffon@google.com>
Subject: mm-add-mremap_dontunmap-to-mremap-v6
- Code cleanup suggested by Kirill.
- Correct commit message to more accurately reflect the behavior.
- Clear VM_LOCKED and VM_LOCKEDONFAULT on the old vma.
Link: http://lkml.kernel.org/r/20200218173221.237674-1-bgeffon@google.com
Signed-off-by: Brian Geffon <bgeffon@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: "Michael S . Tsirkin" <mst@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Deacon <will@kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Sonny Rao <sonnyrao@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Jesse Barnes <jsbarnes@google.com>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: "Kirill A . Shutemov" <kirill@shutemov.name>
Cc: Lokesh Gidra <lokeshgidra@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/mremap.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/mm/mremap.c~mm-add-mremap_dontunmap-to-mremap-v6
+++ a/mm/mremap.c
@@ -426,8 +426,13 @@ static unsigned long move_vma(struct vm_
* for old_len, but we're now adding new_len - old_len locked
* bytes to the new mapping.
*/
- if (new_len > old_len)
+ if (vm_flags & VM_LOCKED && new_len > old_len) {
mm->locked_vm += (new_len - old_len) >> PAGE_SHIFT;
+ *locked = true;
+ }
+
+ /* We always clear VM_LOCKED[ONFAULT] on the old vma */
+ vma->vm_flags &= VM_LOCKED_CLEAR_MASK;
goto out;
}
@@ -686,7 +691,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, a
if (down_write_killable(¤t->mm->mmap_sem))
return -EINTR;
- if (flags & MREMAP_FIXED || flags & MREMAP_DONTUNMAP) {
+ if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) {
ret = mremap_to(addr, old_len, new_addr, new_len,
&locked, flags, &uf, &uf_unmap_early,
&uf_unmap);
_
Patches currently in -mm which might be from bgeffon@google.com are
mm-add-mremap_dontunmap-to-mremap.patch
mm-add-mremap_dontunmap-to-mremap-v7.patch
selftest-add-mremap_dontunmap-selftest.patch
selftest-add-mremap_dontunmap-selftest-v7.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-04-02 3:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-02 3:30 [folded-merged] mm-add-mremap_dontunmap-to-mremap-v6.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).