Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a1300e authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: avoid VM_BUG_ON page_count(page) false positives in __collapse_huge_page_copy 



Speculative cache pagecache lookups can elevate the refcount from
under us, so avoid the false positive. If the refcount is < 2 we'll be
notified by a VM_BUG_ON in put_page_testzero as there are two
put_page(src_page) in a row before returning from this function.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Reviewed-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Petr Holasek <pholasek@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63994137

mm/huge_memory.c

+0 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,6 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, 
			src_page = pte_page(pteval);

			copy_user_highpage(page, src_page, address, vma);

			VM_BUG_ON(page_mapcount(src_page) != 1);

			VM_BUG_ON(page_count(src_page) != 2);

			release_pte_page(src_page);

			/*

			 * ptl mostly unnecessary, but preempt has to