diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2016-05-27 14:27:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 18:23:43 -0700 |
| commit | e2a120ab424856178a5ceae7521100808ee9112b (patch) | |
| tree | 692814618a62848f4dfabd37a43f0f47f11de526 /mm | |
| parent | 6d7ceda76ce9708fa796a9c494f0422370dd6055 (diff) | |
mm: thp: avoid false positive VM_BUG_ON_PAGE in page_move_anon_rmap()
commit 0798d3c022dc63eb0ec02b511e1f76ca8411ef8e upstream.
If page_move_anon_rmap() is refiling a pmd-splitted THP mapped in a tail
page from a pte, the "address" must be THP aligned in order for the
page->index bugcheck to pass in the CONFIG_DEBUG_VM=y builds.
Link: http://lkml.kernel.org/r/1464253620-106404-1-git-send-email-kirill.shutemov@linux.intel.com
Fixes: 6d0a07edd17c ("mm: thp: calculate the mapcount correctly for THP pages during WP faults")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 307b555024ef..3ebf9c4c2f4d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1098,6 +1098,8 @@ void page_move_anon_rmap(struct page *page, VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_VMA(!anon_vma, vma); + if (IS_ENABLED(CONFIG_DEBUG_VM) && PageTransHuge(page)) + address &= HPAGE_PMD_MASK; VM_BUG_ON_PAGE(page->index != linear_page_index(vma, address), page); anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; |