]> www.infradead.org Git - users/jedix/linux-maple.git/commit
mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check
authorKonstantin Khlebnikov <koct9i@gmail.com>
Thu, 28 Apr 2016 23:18:32 +0000 (16:18 -0700)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:21:51 +0000 (17:21 -0500)
commit5f4c9eeb279ee93343ad22a53b529f7e1536a0b1
treeee4b7febea03ff21955eb956860b5417456138af
parent128383b439ab38ce3dec211fe54737a5bb4c4f89
mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check

Orabug: 25227142

[ Upstream commit 3486b85a29c1741db99d0c522211c82d2b7a56d0 ]

Khugepaged detects own VMAs by checking vm_file and vm_ops but this way
it cannot distinguish private /dev/zero mappings from other special
mappings like /dev/hpet which has no vm_ops and popultes PTEs in mmap.

This fixes false-positive VM_BUG_ON and prevents installing THP where
they are not expected.

Link: http://lkml.kernel.org/r/CACT4Y+ZmuZMV5CjSFOeXviwQdABAgT7T+StKfTqan9YDtgEi5g@mail.gmail.com
Fixes: 78f11a255749 ("mm: thp: fix /dev/zero MAP_PRIVATE and vm_flags cleanups")
Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 9684dc001e986b11763b30c7bd71c0091fce28f8)

Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
mm/huge_memory.c