[053/156] mm,hwpoison: double-check page count in __get_any_page()

Commit Message

Andrew Morton Oct. 16, 2020, 2:44 a.m. UTC

From: Naoya Horiguchi <[e-mail]>
Subject: mm,hwpoison: double-check page count in __get_any_page()

Soft offlining could fail with EIO due to the race condition with hugepage
migration.  This issuse became visible due to the change by previous patch
that makes soft offline handler take page refcount by its own.  We have no
way to directly pin zero refcount page, and the page considered as a zero
refcount page could be allocated just after the first check.

This patch adds the second check to find the race and gives us chance to
handle it more reliably.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Naoya Horiguchi <[e-mail]>
Reported-by: Qian Cai <[e-mail]>
Cc: "Aneesh Kumar K.V" <[e-mail]>
Cc: Aneesh Kumar K.V <[e-mail]>
Cc: Aristeu Rozanski <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: Dmitry Yakunin <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Mike Kravetz <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Tony Luck <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/memory-failure.c |    6 ++++++
 1 file changed, 6 insertions(+)

Patch

--- a/mm/memory-failure.c~mmhwpoison-double-check-page-count-in-__get_any_page
+++ a/mm/memory-failure.c
@@ -1707,6 +1707,9 @@  static int __get_any_page(struct page *p
 		} else if (is_free_buddy_page(p)) {
 			pr_info("%s: %#lx free buddy page\n", __func__, pfn);
 			ret = 0;
+		} else if (page_count(p)) {
+			/* raced with allocation */
+			ret = -EBUSY;
 		} else {
 			pr_info("%s: %#lx: unknown zero refcount page type %lx\n",
 				__func__, pfn, p->flags);
@@ -1723,6 +1726,9 @@  static int get_any_page(struct page *pag
 {
 	int ret = __get_any_page(page, pfn, flags);
 
+	if (ret == -EBUSY)
+		ret = __get_any_page(page, pfn, flags);
+
 	if (ret == 1 && !PageHuge(page) &&
 	    !PageLRU(page) && !__PageMovable(page)) {
 		/*