linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: 王贇 <yun.wang@linux.alibaba.com>
To: Naoya Horiguchi <naoya.horiguchi@nec.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	"open list:HWPOISON MEMORY FAILURE HANDLING" <linux-mm@kvack.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v2] mm: fix panic caused by __page_handle_poison()
Date: Tue, 31 Aug 2021 17:37:49 +0800	[thread overview]
Message-ID: <61782ac6-1e8a-4f6f-35e6-e94fce3b37f5@linux.alibaba.com> (raw)
In-Reply-To: <58b6b733-b021-7eb8-4226-1b98d50c8c82@linux.alibaba.com>

By commit 510d25c92ec4 ("mm/hwpoison: disable pcp for
page_handle_poison()"), __page_handle_poison() was
introduced, and if we mark:

RET_A = dissolve_free_huge_page();
RET_B = take_page_off_buddy();

then __page_handle_poison was supposed to return TRUE When
RET_A == 0 && RET_B == TRUE

But since it failed to take care the case when RET_A is
-EBUSY or -ENOMEM, and just return the ret as a bool which
actually become TRUE, it break the original logic.

The following result is a huge page in freelist but was
referenced as poisoned, and lead into the final panic:

  kernel BUG at mm/internal.h:95!
  invalid opcode: 0000 [#1] SMP PTI
  skip...
  RIP: 0010:set_page_refcounted mm/internal.h:95 [inline]
  RIP: 0010:remove_hugetlb_page+0x23c/0x240 mm/hugetlb.c:1371
  skip...
  Call Trace:
   remove_pool_huge_page+0xe4/0x110 mm/hugetlb.c:1892
   return_unused_surplus_pages+0x8d/0x150 mm/hugetlb.c:2272
   hugetlb_acct_memory.part.91+0x524/0x690 mm/hugetlb.c:4017

This patch replace 'bool' with 'int' to handle RET_A correctly.

Fixes: 510d25c92ec4 ("mm/hwpoison: disable pcp for page_handle_poison()")
Cc: <stable@vger.kernel.org> # 5.14
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Reported-by: Abaci <abaci@linux.alibaba.com>
Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com>
---
 mm/memory-failure.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 470400c..0fff717 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -68,7 +68,7 @@

 static bool __page_handle_poison(struct page *page)
 {
-	bool ret;
+	int ret;

 	zone_pcp_disable(page_zone(page));
 	ret = dissolve_free_huge_page(page);
@@ -76,7 +76,7 @@ static bool __page_handle_poison(struct page *page)
 		ret = take_page_off_buddy(page);
 	zone_pcp_enable(page_zone(page));

-	return ret;
+	return ret > 0;
 }

 static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, bool release)
-- 
1.8.3.1


      parent reply	other threads:[~2021-08-31  9:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-30 10:07 [PATCH] mm: fix panic caused by __page_handle_poison() 王贇
2021-08-31  9:11 ` HORIGUCHI NAOYA(堀口 直也)
2021-08-31  9:35   ` 王贇
2021-08-31  9:37 ` 王贇 [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=61782ac6-1e8a-4f6f-35e6-e94fce3b37f5@linux.alibaba.com \
    --to=yun.wang@linux.alibaba.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=naoya.horiguchi@nec.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).