Commit a6fddef4 authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/memory-failure: convert unpoison_memory() to folios 

Use a folio inside unpoison_memory which replaces a compound_head() call
with a call to page_folio().

Link: https://lkml.kernel.org/r/20230112204608.80136-9-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 595dd818

mm/memory-failure.c

+9 −11
Original line number Original line Diff line number Diff line
@@ -2335,7 +2335,6 @@ core_initcall(memory_failure_init); 
 */

 */

int unpoison_memory(unsigned long pfn)

int unpoison_memory(unsigned long pfn)

{

{

	struct page *page;

	struct folio *folio;

	struct folio *folio;

	struct page *p;

	struct page *p;

	int ret = -EBUSY;

	int ret = -EBUSY;
@@ -2348,7 +2347,6 @@ int unpoison_memory(unsigned long pfn) 
		return -ENXIO;

		return -ENXIO;





	p = pfn_to_page(pfn);

	p = pfn_to_page(pfn);

	page = compound_head(p);

	folio = page_folio(p);

	folio = page_folio(p);





	mutex_lock(&mf_mutex);

	mutex_lock(&mf_mutex);
@@ -2360,31 +2358,31 @@ int unpoison_memory(unsigned long pfn) 
		goto unlock_mutex;

		goto unlock_mutex;

	}

	}





	if (!PageHWPoison(p)) {

	if (!folio_test_hwpoison(folio)) {

		unpoison_pr_info("Unpoison: Page was already unpoisoned %#lx\n",

		unpoison_pr_info("Unpoison: Page was already unpoisoned %#lx\n",

				 pfn, &unpoison_rs);

				 pfn, &unpoison_rs);

		goto unlock_mutex;

		goto unlock_mutex;

	}

	}





	if (page_count(page) > 1) {

	if (folio_ref_count(folio) > 1) {

		unpoison_pr_info("Unpoison: Someone grabs the hwpoison page %#lx\n",

		unpoison_pr_info("Unpoison: Someone grabs the hwpoison page %#lx\n",

				 pfn, &unpoison_rs);

				 pfn, &unpoison_rs);

		goto unlock_mutex;

		goto unlock_mutex;

	}

	}





	if (page_mapped(page)) {

	if (folio_mapped(folio)) {

		unpoison_pr_info("Unpoison: Someone maps the hwpoison page %#lx\n",

		unpoison_pr_info("Unpoison: Someone maps the hwpoison page %#lx\n",

				 pfn, &unpoison_rs);

				 pfn, &unpoison_rs);

		goto unlock_mutex;

		goto unlock_mutex;

	}

	}





	if (page_mapping(page)) {

	if (folio_mapping(folio)) {

		unpoison_pr_info("Unpoison: the hwpoison page has non-NULL mapping %#lx\n",

		unpoison_pr_info("Unpoison: the hwpoison page has non-NULL mapping %#lx\n",

				 pfn, &unpoison_rs);

				 pfn, &unpoison_rs);

		goto unlock_mutex;

		goto unlock_mutex;

	}

	}





	if (PageSlab(page) || PageTable(page) || PageReserved(page))

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

		goto unlock_mutex;

		goto unlock_mutex;





	ret = get_hwpoison_page(p, MF_UNPOISON);

	ret = get_hwpoison_page(p, MF_UNPOISON);
@@ -2397,7 +2395,7 @@ int unpoison_memory(unsigned long pfn) 
				goto unlock_mutex;

				goto unlock_mutex;

			}

			}

		}

		}

		ret = TestClearPageHWPoison(page) ? 0 : -EBUSY;

		ret = folio_test_clear_hwpoison(folio) ? 0 : -EBUSY;

	} else if (ret < 0) {

	} else if (ret < 0) {

		if (ret == -EHWPOISON) {

		if (ret == -EHWPOISON) {

			ret = put_page_back_buddy(p) ? 0 : -EBUSY;

			ret = put_page_back_buddy(p) ? 0 : -EBUSY;
@@ -2410,14 +2408,14 @@ int unpoison_memory(unsigned long pfn) 
			count = folio_free_raw_hwp(folio, false);

			count = folio_free_raw_hwp(folio, false);

			if (count == 0) {

			if (count == 0) {

				ret = -EBUSY;

				ret = -EBUSY;

				put_page(page);

				folio_put(folio);

				goto unlock_mutex;

				goto unlock_mutex;

			}

			}

		}

		}





		put_page(page);

		folio_put(folio);

		if (TestClearPageHWPoison(p)) {

		if (TestClearPageHWPoison(p)) {

			put_page(page);

			folio_put(folio);

			ret = 0;

			ret = 0;

		}

		}

	}

	}