linux-kernel - [PATCH v2] arm64/mm: Delete __init region from memblock.reserved

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240902023940.43227-1-rongqianfeng@vivo.com>
Date: Mon,  2 Sep 2024 10:39:35 +0800
From: Rong Qianfeng <rongqianfeng@...o.com>
To: Catalin Marinas <catalin.marinas@....com>,
	Will Deacon <will@...nel.org>,
	Baoquan He <bhe@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Petr Tesarik <ptesarik@...e.com>,
	Zhen Lei <thunder.leizhen@...wei.com>,
	Rong Qianfeng <rongqianfeng@...o.com>,
	"Mike Rapoport (IBM)" <rppt@...nel.org>,
	Ard Biesheuvel <ardb@...nel.org>,
	linux-arm-kernel@...ts.infradead.org,
	linux-kernel@...r.kernel.org
Cc: opensource.kernel@...o.com
Subject: [PATCH v2] arm64/mm: Delete __init region from memblock.reserved

If CONFIG_ARCH_KEEP_MEMBLOCK is enabled, the memory information in
memblock will be retained.  We release the __init memory here, and
we should also delete the corresponding region in memblock.reserved,
which allows debugfs/memblock/reserved to display correct memory
information.

Signed-off-by: Rong Qianfeng <rongqianfeng@...o.com>
---
-v2:
* Removed the conditional check for whether CONFIG_ARCH_KEEP_MEMBLOCK
  is enabled, since it is always enabled on arm64.Thanks to
  Ard Biesheuvel for the correction.

-v1:
https://lore.kernel.org/lkml/20240830080020.33666-1-rongqianfeng@vivo.com/

 arch/arm64/mm/init.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index bfb10969cbf0..b275ead50415 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -402,6 +402,12 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
+	unsigned long aligned_begin = ALIGN_DOWN((u64)__init_begin, PAGE_SIZE);
+	unsigned long aligned_end = ALIGN((u64)__init_end, PAGE_SIZE);
+
+	/* Delete __init region from memblock.reserved. */
+	memblock_free((void *)aligned_begin, aligned_end - aligned_begin);
+
 	free_reserved_area(lm_alias(__init_begin),
 			   lm_alias(__init_end),
 			   POISON_FREE_INITMEM, "unused kernel");
-- 
2.39.0