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

mm/memory-failure: save some page_folio() calls 

Use local variable folio directly to save a page_folio() call.  Also use
folio_mapped() to save more page_folio() calls.  No functional change
intended.

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


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: kernel test robot <lkp@intel.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent babde186

mm/memory-failure.c

+3 −3
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, 
	 * This check implies we don't kill processes if their pages

	 * are in the swap cache early. Those are always late kills.

	 */

	if (!page_mapped(p))

	if (!folio_mapped(folio))

		return true;



	if (folio_test_swapcache(folio)) {
@@ -1626,10 +1626,10 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, 
		try_to_unmap(folio, ttu);

	}



	unmap_success = !page_mapped(p);

	unmap_success = !folio_mapped(folio);

	if (!unmap_success)

		pr_err("%#lx: failed to unmap page (folio mapcount=%d)\n",

		       pfn, folio_mapcount(page_folio(p)));

		       pfn, folio_mapcount(folio));



	/*

	 * try_to_unmap() might put mlocked page in lru cache, so call