From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <willy@infradead.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 3/3] mm/debug: Check page poisoned firstly in dump_page()
Date: Wed, 12 May 2021 11:10:57 +0800 [thread overview]
Message-ID: <20210512031057.13580-3-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20210512031057.13580-1-wangkefeng.wang@huawei.com>
If page is poisoned, it will crash when we call some page related
functions, so must check whether the page is poisoned or not firstly.
Fixes: 6197ab984b41 ("mm: improve dump_page() for compound pages")
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/debug.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/mm/debug.c b/mm/debug.c
index 84cdcd0f7bd3..cf84cd9df527 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -44,20 +44,19 @@ const struct trace_print_flags vmaflag_names[] = {
static void __dump_page(struct page *page, const char *reason)
{
- struct page *head = compound_head(page);
+ struct page *head = NULL;
struct address_space *mapping;
- bool page_poisoned = PagePoisoned(page);
- bool compound = PageCompound(page);
+ bool compound;
/*
* Accessing the pageblock without the zone lock. It could change to
* "isolate" again in the meantime, but since we are just dumping the
* state for debugging, it should be fine to accept a bit of
* inaccuracy here due to racing.
*/
- bool page_cma = is_migrate_cma_page(page);
+ bool page_cma;
int mapcount;
char *type = "";
-
+ bool page_poisoned = PagePoisoned(page);
/*
* If struct page is poisoned don't access Page*() functions as that
* leads to recursive loop. Page*() check for poisoned pages, and calls
@@ -68,6 +67,10 @@ static void __dump_page(struct page *page, const char *reason)
goto hex_only;
}
+ head = compound_head(page);
+ page_poisoned = PagePoisoned(page);
+ page_cma = is_migrate_cma_page(page);
+
if (page < head || (page >= head + MAX_ORDER_NR_PAGES)) {
/*
* Corrupt page, so we cannot call page_mapping. Instead, do a
@@ -178,7 +181,7 @@ static void __dump_page(struct page *page, const char *reason)
print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32,
sizeof(unsigned long), page,
sizeof(struct page), false);
- if (head != page)
+ if (head && head != page)
print_hex_dump(KERN_WARNING, "head: ", DUMP_PREFIX_NONE, 32,
sizeof(unsigned long), head,
sizeof(struct page), false);
--
2.26.2
next prev parent reply other threads:[~2021-05-12 3:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 3:10 [PATCH 1/3] mm/page_alloc: Use dump_page() directly Kefeng Wang
2021-05-12 3:10 ` [PATCH 2/3] mm: Make __dump_page() static Kefeng Wang
2021-05-12 3:10 ` Kefeng Wang [this message]
2021-05-12 3:15 ` [PATCH 3/3] mm/debug: Check page poisoned firstly in dump_page() Matthew Wilcox
2021-05-12 3:23 ` Kefeng Wang
2021-05-12 3:14 ` [PATCH 1/3] mm/page_alloc: Use dump_page() directly Matthew Wilcox
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=20210512031057.13580-3-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.org \
/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).