From: Mike Rapoport <rppt@kernel.org>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>,
Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] memblock: exclude NOMAP regions from kmemleak
Date: Wed, 13 Oct 2021 08:47:56 +0300 [thread overview]
Message-ID: <20211013054756.12177-1-rppt@kernel.org> (raw)
From: Mike Rapoport <rppt@linux.ibm.com>
Vladimir Zapolskiy reports:
commit a7259df76702 ("memblock: make memblock_find_in_range method private")
invokes a kernel panic while running kmemleak on OF platforms with nomaped
regions:
Unable to handle kernel paging request at virtual address fff000021e00000
[...]
scan_block+0x64/0x170
scan_gray_list+0xe8/0x17c
kmemleak_scan+0x270/0x514
kmemleak_write+0x34c/0x4ac
Indeed, NOMAP regions don't have linear map entries so an attempt to scan
these areas would fault.
Prevent such faults by excluding NOMAP regions from kmemleak.
Link: https://lore.kernel.org/all/8ade5174-b143-d621-8c8e-dc6a1898c6fb@linaro.org
Fixes: a7259df76702 ("memblock: make memblock_find_in_range method private")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Tested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
---
mm/memblock.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 184dcd2e5d99..5c3503c98b2f 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -936,7 +936,12 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
*/
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
{
- return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
+ int ret = memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
+
+ if (!ret)
+ kmemleak_free_part_phys(base, size);
+
+ return ret;
}
/**
base-commit: 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc
--
2.28.0
next reply other threads:[~2021-10-13 5:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 5:47 Mike Rapoport [this message]
2021-10-13 7:45 ` [PATCH] memblock: exclude NOMAP regions from kmemleak Catalin Marinas
2021-10-13 11:35 ` Mike Rapoport
2021-10-19 4:21 ` Anshuman Khandual
[not found] ` <c30ff0a2-d196-c50d-22f0-bd50696b1205@quicinc.com>
2021-10-19 5:45 ` Mike Rapoport
2021-10-19 11:37 ` Catalin Marinas
2021-10-19 15:06 ` Qian Cai
2021-10-19 15:53 ` Catalin Marinas
2021-10-19 17:59 ` Qian Cai
2021-10-19 18:33 ` Mike Rapoport
2021-10-20 7:38 ` Mike Rapoport
2021-10-20 8:18 ` Catalin Marinas
2021-10-20 8:42 ` Mike Rapoport
2021-10-20 9:33 ` Catalin Marinas
2021-10-20 10:13 ` Catalin Marinas
2021-10-20 10:39 ` Mike Rapoport
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=20211013054756.12177-1-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@linux.ibm.com \
--cc=vladimir.zapolskiy@linaro.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).