From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FB00C433EF for ; Thu, 31 Mar 2022 02:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ag0GBBPsCB4qjozO38JdvJDjerk4qib0Qj+eP+JIfS0=; b=ABaVrc5/KEGAGI IqtfxE/Ct31vgrfazv+dyCsEOhQG8Idi7Q6riR9WZTvyWxvxGXhwqbYMm4nCqt64jU/SZYoWG5uwg XUSDKgS+cGsk8AxijSatSo5hi+sbDTArIQ4DD6iFnmUjWpWpvuDq9A3LLyjFgZwcdiFyMcloS6rbP AttaqzX1gZu2GgXLPFV1zFvOP4HHd7ZjoLzKuloAVB3qFgHJJDyqe4gDv68YkcCmzDednC83CnPqO D2HekR/zjP6haMreczToCKYtbXmpZmHghD30mrFibsDClsrrcVv0J65J2Q0MVcrSEheclCugHL3cp /5BF+fBYA6kDyi/D+01Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZkqz-000LxU-3X; Thu, 31 Mar 2022 02:48:05 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nZkpz-000LZe-6A for linux-arm-kernel@lists.infradead.org; Thu, 31 Mar 2022 02:47:07 +0000 Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KTSPF5SyZzdZQT; Thu, 31 Mar 2022 10:46:41 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 31 Mar 2022 10:47:00 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 31 Mar 2022 10:46:59 +0800 From: Kefeng Wang To: , , , CC: , , Kefeng Wang Subject: [PATCH v2 2/3] arm64: mm: Don't defer reserve_crashkernel() with dma_force_32bit Date: Thu, 31 Mar 2022 10:59:45 +0800 Message-ID: <20220331025946.51163-3-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220331025946.51163-1-wangkefeng.wang@huawei.com> References: <20220331025946.51163-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220330_194703_587387_7ACD25BB X-CRM114-Status: GOOD ( 17.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org ARM64 enable ZONE_DMA by default, and with ZONE_DMA crash kernel memory reservation is delayed until DMA zone memory range size initilazation performed in zone_sizes_init(), but for most platforms use 32bit dma_zone_bits, so add dma_force_32bit kernel parameter if ZONE_DMA enabled, and initialize arm64_dma_phys_limit to dma32_phys_limit in arm64_memblock_init() if dma_force_32bit is setup, this could let the crash kernel reservation earlier, and allows linear creation with block mapping. Signed-off-by: Kefeng Wang --- arch/arm64/include/asm/kexec.h | 1 + arch/arm64/mm/init.c | 42 ++++++++++++++++++++++++++-------- arch/arm64/mm/mmu.c | 4 ++-- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 9839bfc163d7..653b16acd09a 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -94,6 +94,7 @@ static inline void crash_post_resume(void) {} void cpu_soft_restart(unsigned long el2_switch, unsigned long entry, unsigned long arg0, unsigned long arg1, unsigned long arg2); +bool crashkernel_could_early_reserve(void) #endif #define ARCH_HAS_KIMAGE_ARCH diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index fb01eb489fa9..329e236c3c52 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -66,7 +66,8 @@ EXPORT_SYMBOL(memstart_addr); * depending on DMA memory zones configs (ZONE_DMA) -- * * In absence of ZONE_DMA and ZONE_DMA32 configs arm64_dma_phys_limit - * initialized here and if only with ZONE_DMA32 arm64_dma_phys_limit + * initialized here, and if only with ZONE_DMA32 or if with ZONE_DMA + * and dma_force_32bit kernel parameter, the arm64_dma_phys_limit is * initialised to dma32_phys_limit. This lets early reservation of * crash kernel memory which has a dependency on arm64_dma_phys_limit. * Reserving memory early for crash kernel allows linear creation of block @@ -92,6 +93,27 @@ phys_addr_t __ro_after_init arm64_dma_phys_limit; phys_addr_t __ro_after_init arm64_dma_phys_limit = PHYS_MASK + 1; #endif +static bool __ro_after_init arm64_dma_force_32bit; +#ifdef CONFIG_ZONE_DMA +static int __init arm64_dma_force_32bit_setup(char *p) +{ + zone_dma_bits = 32; + arm64_dma_force_32bit = true; + + return 0; +} +early_param("dma_force_32bit", arm64_dma_force_32bit_setup); +#endif + +bool __init crashkernel_could_early_reserve(void) +{ + if (!IS_ENABLED(CONFIG_ZONE_DMA)) + return true; + if (arm64_dma_force_32bit) + return true; + return false; +} + /* * reserve_crashkernel() - reserves memory for crash kernel * @@ -163,12 +185,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) { unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA - unsigned int acpi_zone_dma_bits; - unsigned int dt_zone_dma_bits; + if (!arm64_dma_force_32bit) { + unsigned int acpi_zone_dma_bits; + unsigned int dt_zone_dma_bits; - acpi_zone_dma_bits = fls64(acpi_iort_dma_get_max_cpu_address()); - dt_zone_dma_bits = fls64(of_dma_get_max_cpu_address(NULL)); - zone_dma_bits = min3(32U, dt_zone_dma_bits, acpi_zone_dma_bits); + acpi_zone_dma_bits = fls64(acpi_iort_dma_get_max_cpu_address()); + dt_zone_dma_bits = fls64(of_dma_get_max_cpu_address(NULL)); + zone_dma_bits = min3(32U, dt_zone_dma_bits, acpi_zone_dma_bits); + } arm64_dma_phys_limit = max_zone_phys(zone_dma_bits); max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit); #endif @@ -336,8 +360,8 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); dma32_phys_limit = max_zone_phys(32); - if (!IS_ENABLED(CONFIG_ZONE_DMA)) { - if (IS_ENABLED(CONFIG_ZONE_DMA32)) + if (crashkernel_could_early_reserve()) { + if (IS_ENABLED(CONFIG_ZONE_DMA32) || dma_force_32bit) arm64_dma_phys_limit = dma32_phys_limit; reserve_crashkernel(); } @@ -388,7 +412,7 @@ void __init bootmem_init(void) * request_standard_resources() depends on crashkernel's memory being * reserved, so do it here. */ - if (IS_ENABLED(CONFIG_ZONE_DMA)) + if (!crashkernel_could_early_reserve()) reserve_crashkernel(); memblock_dump_all(); diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 23734481318a..8f7e8452d906 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -529,7 +529,7 @@ static void __init map_mem(pgd_t *pgdp) #ifdef CONFIG_KEXEC_CORE if (crash_mem_map) { - if (IS_ENABLED(CONFIG_ZONE_DMA)) + if (!crashkernel_could_early_reserve()) flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; else if (crashk_res.end) memblock_mark_nomap(crashk_res.start, @@ -570,7 +570,7 @@ static void __init map_mem(pgd_t *pgdp) * through /sys/kernel/kexec_crash_size interface. */ #ifdef CONFIG_KEXEC_CORE - if (crash_mem_map && !IS_ENABLED(CONFIG_ZONE_DMA)) { + if (crash_mem_map && crashkernel_could_early_reserve()) { if (crashk_res.end) { __map_memblock(pgdp, crashk_res.start, crashk_res.end + 1, -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel