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

Configure Feed

Select the types of activity you want to include in your feed.

mm: don't overwrite mm->def_flags in do_mlockall()

With commit 8e72033f2a48 ("thp: make MADV_HUGEPAGE check for
mm->def_flags") the VM_NOHUGEPAGE flag may be set on s390 in
mm->def_flags for certain processes, to prevent future thp mappings.
This would be overwritten by do_mlockall(), which sets it back to 0 with
an optional VM_LOCKED flag set.

To fix this, instead of overwriting mm->def_flags in do_mlockall(), only
the VM_LOCKED flag should be set or cleared.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Reported-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Gerald Schaefer and committed by
Linus Torvalds
9977f0f1 3399cfb5

+3 -3
+3 -3
mm/mlock.c
··· 517 517 static int do_mlockall(int flags) 518 518 { 519 519 struct vm_area_struct * vma, * prev = NULL; 520 - unsigned int def_flags = 0; 521 520 522 521 if (flags & MCL_FUTURE) 523 - def_flags = VM_LOCKED; 524 - current->mm->def_flags = def_flags; 522 + current->mm->def_flags |= VM_LOCKED; 523 + else 524 + current->mm->def_flags &= ~VM_LOCKED; 525 525 if (flags == MCL_FUTURE) 526 526 goto out; 527 527