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

Commit 93a9eb39 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

hwpoison: fix hugetlbfs/thp precheck in hwpoison_user_mappings() 



A recent fix from Chen Yucong, commit 0bc1f8b0 ("hwpoison: fix the
handling path of the victimized page frame that belong to non-LRU")
rejects going into unmapping operation for hugetlbfs/thp pages, which
results in failing error containing on such pages.  This patch fixes it.

With this patch, hwpoison functional tests in mce-test testsuite pass.

Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Chen Yucong <slaoub@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0193ed82

mm/memory-failure.c

+7 −1
Original line number Diff line number Diff line
@@ -895,7 +895,13 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn, 
	struct page *hpage = *hpagep;

	struct page *ppage;



	if (PageReserved(p) || PageSlab(p) || !PageLRU(p))

	/*

	 * Here we are interested only in user-mapped pages, so skip any

	 * other types of pages.

	 */

	if (PageReserved(p) || PageSlab(p))

		return SWAP_SUCCESS;

	if (!(PageLRU(hpage) || PageHuge(p)))

		return SWAP_SUCCESS;



	/*