linux-kernel - [PATCH stable v5.10 1/7] arm64: mm: Move reserve_crashkernel() into mem

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-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 3 Mar 2021 15:33:13 +0800
From:   Jing Xiangfeng <jingxiangfeng@...wei.com>
To:     <gregkh@...uxfoundation.org>, <catalin.marinas@....com>,
        <will@...nel.org>, <akpm@...ux-foundation.org>,
        <nsaenzjulienne@...e.de>, <paul.walmsley@...ive.com>,
        <palmer@...belt.com>, <aou@...s.berkeley.edu>, <rppt@...nel.org>,
        <lorenzo.pieralisi@....com>, <guohanjun@...wei.com>,
        <sudeep.holla@....com>, <rjw@...ysocki.net>, <lenb@...nel.org>,
        <song.bao.hua@...ilicon.com>, <ardb@...nel.org>,
        <anshuman.khandual@....com>, <bhelgaas@...gle.com>, <guro@...com>,
        <robh+dt@...nel.org>
CC:     <stable@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>,
        <frowand.list@...il.com>, <devicetree@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <linux-mm@...ck.org>,
        <linux-riscv@...ts.infradead.org>, <jingxiangfeng@...wei.com>,
        <wangkefeng.wang@...wei.com>, Jeremy Linton <jeremy.linton@....com>
Subject: [PATCH stable v5.10 1/7] arm64: mm: Move reserve_crashkernel() into mem_init()

From: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>

commit 0a30c53573b07d5561457e41fb0ab046cd857da5 upstream

crashkernel might reserve memory located in ZONE_DMA. We plan to delay
ZONE_DMA's initialization after unflattening the devicetree and ACPI's
boot table initialization, so move it later in the boot process.
Specifically into bootmem_init() since request_standard_resources()
depends on it.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>
Tested-by: Jeremy Linton <jeremy.linton@....com>
Link: https://lore.kernel.org/r/20201119175400.9995-2-nsaenzjulienne@suse.de
Signed-off-by: Catalin Marinas <catalin.marinas@....com>
Cc: <stable@...r.kernel.org>
Signed-off-by: Jing Xiangfeng <jingxiangfeng@...wei.com>
---
 arch/arm64/mm/init.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 00576a960f11..686653e33250 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -386,8 +386,6 @@ void __init arm64_memblock_init(void)
 	else
 		arm64_dma32_phys_limit = PHYS_MASK + 1;
 
-	reserve_crashkernel();
-
 	reserve_elfcorehdr();
 
 	high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
@@ -427,6 +425,12 @@ void __init bootmem_init(void)
 	sparse_init();
 	zone_sizes_init(min, max);
 
+	/*
+	 * request_standard_resources() depends on crashkernel's memory being
+	 * reserved, so do it here.
+	 */
+	reserve_crashkernel();
+
 	memblock_dump_all();
 }
 
-- 
2.25.1