Commit 7a8817f2 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm: memory-failure: add PageOffline() check 

Memory failure is not interested in logically offlined pages.  Skip this
type of page.

Link: https://lkml.kernel.org/r/20230727115643.639741-5-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 52ae298e

mm/memory-failure.c

+3 −2
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, 
	 * Here we are interested only in user-mapped pages, so skip any

	 * other types of pages.

	 */

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

	if (PageReserved(p) || PageSlab(p) || PageTable(p) || PageOffline(p))

		return true;

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

		return true;
@@ -2533,7 +2533,8 @@ int unpoison_memory(unsigned long pfn) 
		goto unlock_mutex;

	}



	if (folio_test_slab(folio) || PageTable(&folio->page) || folio_test_reserved(folio))

	if (folio_test_slab(folio) || PageTable(&folio->page) ||

	    folio_test_reserved(folio) || PageOffline(&folio->page))

		goto unlock_mutex;



	/*