Commit dd6e2402 authored by Oscar Salvador's avatar Oscar Salvador Committed by Linus Torvalds
Browse files

mm,hwpoison: kill put_hwpoison_page 



After commit 4e41a30c ("mm: hwpoison: adjust for new thp
refcounting"), put_hwpoison_page got reduced to a put_page.  Let us just
use put_page instead.

Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Aristeu Rozanski <aris@ruivo.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dmitry Yakunin <zeil@yandex-team.ru>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Oscar Salvador <osalvador@suse.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200922135650.1634-7-osalvador@suse.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc7560b4

include/linux/mm.h

+0 −1
Original line number Diff line number Diff line
@@ -3025,7 +3025,6 @@ extern int memory_failure(unsigned long pfn, int flags); 
extern void memory_failure_queue(unsigned long pfn, int flags);

extern void memory_failure_queue_kick(int cpu);

extern int unpoison_memory(unsigned long pfn);

#define put_hwpoison_page(page)	put_page(page)

extern int sysctl_memory_failure_early_kill;

extern int sysctl_memory_failure_recovery;

extern void shake_page(struct page *p, int access);

mm/memory-failure.c

+15 −15
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags) 
		pr_err("Memory failure: %#lx: just unpoisoned\n", pfn);

		num_poisoned_pages_dec();

		unlock_page(head);

		put_hwpoison_page(head);

		put_page(head);

		return 0;

	}
@@ -1335,7 +1335,7 @@ int memory_failure(unsigned long pfn, int flags) 
					pfn);

			if (TestClearPageHWPoison(p))

				num_poisoned_pages_dec();

			put_hwpoison_page(p);

			put_page(p);

			return -EBUSY;

		}

		unlock_page(p);
@@ -1388,14 +1388,14 @@ int memory_failure(unsigned long pfn, int flags) 
		pr_err("Memory failure: %#lx: just unpoisoned\n", pfn);

		num_poisoned_pages_dec();

		unlock_page(p);

		put_hwpoison_page(p);

		put_page(p);

		return 0;

	}

	if (hwpoison_filter(p)) {

		if (TestClearPageHWPoison(p))

			num_poisoned_pages_dec();

		unlock_page(p);

		put_hwpoison_page(p);

		put_page(p);

		return 0;

	}
@@ -1629,9 +1629,9 @@ int unpoison_memory(unsigned long pfn) 
	}

	unlock_page(page);



	put_hwpoison_page(page);

	put_page(page);

	if (freeit && !(pfn == my_zero_pfn(0) && page_count(p) == 1))

		put_hwpoison_page(page);

		put_page(page);



	return 0;

}
@@ -1692,7 +1692,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) 
		/*

		 * Try to free it.

		 */

		put_hwpoison_page(page);

		put_page(page);

		shake_page(page, 1);



		/*
@@ -1701,7 +1701,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) 
		ret = __get_any_page(page, pfn, 0);

		if (ret == 1 && !PageLRU(page)) {

			/* Drop page reference which is from __get_any_page() */

			put_hwpoison_page(page);

			put_page(page);

			pr_info("soft_offline: %#lx: unknown non LRU page type %lx (%pGp)\n",

				pfn, page->flags, &page->flags);

			return -EIO;
@@ -1724,7 +1724,7 @@ static int soft_offline_huge_page(struct page *page, int flags) 
	lock_page(hpage);

	if (PageHWPoison(hpage)) {

		unlock_page(hpage);

		put_hwpoison_page(hpage);

		put_page(hpage);

		pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);

		return -EBUSY;

	}
@@ -1735,7 +1735,7 @@ static int soft_offline_huge_page(struct page *page, int flags) 
	 * get_any_page() and isolate_huge_page() takes a refcount each,

	 * so need to drop one here.

	 */

	put_hwpoison_page(hpage);

	put_page(hpage);

	if (!ret) {

		pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);

		return -EBUSY;
@@ -1784,7 +1784,7 @@ static int __soft_offline_page(struct page *page, int flags) 
	wait_on_page_writeback(page);

	if (PageHWPoison(page)) {

		unlock_page(page);

		put_hwpoison_page(page);

		put_page(page);

		pr_info("soft offline: %#lx page already poisoned\n", pfn);

		return -EBUSY;

	}
@@ -1799,7 +1799,7 @@ static int __soft_offline_page(struct page *page, int flags) 
	 * would need to fix isolation locking first.

	 */

	if (ret == 1) {

		put_hwpoison_page(page);

		put_page(page);

		pr_info("soft_offline: %#lx: invalidated\n", pfn);

		SetPageHWPoison(page);

		num_poisoned_pages_inc();
@@ -1819,7 +1819,7 @@ static int __soft_offline_page(struct page *page, int flags) 
	 * Drop page reference which is came from get_any_page()

	 * successful isolate_lru_page() already took another one.

	 */

	put_hwpoison_page(page);

	put_page(page);

	if (!ret) {

		LIST_HEAD(pagelist);

		/*
@@ -1863,7 +1863,7 @@ static int soft_offline_in_use_page(struct page *page, int flags) 
				pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page));

			else

				pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page));

			put_hwpoison_page(page);

			put_page(page);

			return -EBUSY;

		}

		unlock_page(page);
@@ -1936,7 +1936,7 @@ int soft_offline_page(unsigned long pfn, int flags) 
	if (PageHWPoison(page)) {

		pr_info("soft offline: %#lx page already poisoned\n", pfn);

		if (flags & MF_COUNT_INCREASED)

			put_hwpoison_page(page);

			put_page(page);

		return -EBUSY;

	}