Commit 9b0ab153 authored by Jane Chu's avatar Jane Chu Committed by Andrew Morton
Browse files

mm/memory-failure: move hwpoison_filter() higher up 

Move hwpoison_filter() higher up as there is no need to spend a lot cycles
only to find out later that the page is supposed to be skipped from
hwpoison handling.

Link: https://lkml.kernel.org/r/20240524215306.2705454-5-jane.chu@oracle.com


Signed-off-by: default avatarJane Chu <jane.chu@oracle.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Oscar Salvador <oalvador@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b8b9488d

mm/memory-failure.c

+12 −8
Original line number Diff line number Diff line
@@ -2300,6 +2300,18 @@ int memory_failure(unsigned long pfn, int flags) 
	}



	folio = page_folio(p);



	/* filter pages that are protected from hwpoison test by users */

	folio_lock(folio);

	if (hwpoison_filter(p)) {

		ClearPageHWPoison(p);

		folio_unlock(folio);

		folio_put(folio);

		res = -EOPNOTSUPP;

		goto unlock_mutex;

	}

	folio_unlock(folio);



	if (folio_test_large(folio)) {

		/*

		 * The flag must be set after the refcount is bumped
@@ -2363,14 +2375,6 @@ int memory_failure(unsigned long pfn, int flags) 
	 */

	page_flags = folio->flags;



	if (hwpoison_filter(p)) {

		ClearPageHWPoison(p);

		folio_unlock(folio);

		folio_put(folio);

		res = -EOPNOTSUPP;

		goto unlock_mutex;

	}



	/*

	 * __munlock_folio() may clear a writeback folio's LRU flag without

	 * the folio lock. We need to wait for writeback completion for this