Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1871878pxx; Sat, 31 Oct 2020 00:40:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVosWYjt8IUtvEpBc4yBMGF9vzRZTSu2kfpZH+8gkK+bCeS7ZgksXE+XRbB6fnckycz0rX X-Received: by 2002:a50:ee95:: with SMTP id f21mr6414020edr.270.1604130059347; Sat, 31 Oct 2020 00:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604130059; cv=none; d=google.com; s=arc-20160816; b=oHd+4KVHL6HkuwN7/KheCV22dC4cotw5avSDs5mWhIaddPtp5HBBt2UwewIcBJauL6 TofGyRibVzwcct0EZ79moCCZgmfKIcytBu0XQwLRTVmHwX8sen7WxHoNbI4EhXrlrijI aQrAVdhs4breA6IPnZ9ar7tUfMCDwa67C3ioUutwXHDRRMBCHZSvsyDYu4lI/QGIE0it gR1OTt4B1QWmwE/z36tq5fP3T2BknT1FN0R57ghBe8i8f/kzU1XQavo5YaSqB/OjtdbZ bOcKmysM+CKk1viaoDA1KEGEi9i2jj0NJN5Ipb6ekLIt8vu96ZD3IDyk1j3dMAW7gxmN cs4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=D/7tm4VCiLeu+2n0mTbteLFtz8T5Zj/K1KeS7UH2lyY=; b=W7Ys+G0q4g1qOt+NVtakgs1OeGEbKCUZZSviKu5jWIMMlVhbPBAgl/5o2FkFXzQuvH DjyShldLLmLRQjcRrQ0EJEmWVG8xfR95LU1fwBzaArT2ITWN0fgi5epeXwHDqgAqSKFv UeyJT6KUlAaN+uQPp+yR5ZoW0G5qzaTJFwnN5XSYJ6rpOShh87ca3CZF6BpPehODO4Q5 UkI7yfRF/naiSageg399V4yDV5chcyMK0/IOdm86zQ+DkeXnKIEK7XS9zWI266FxS7d5 w0zXU8tKhcex6FbP2jv5IJHZ6xIPTClZh8ZXmT61MUW2y6n6042QOz5fPRMZE+A1UI3V QZUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y23si6668346edm.338.2020.10.31.00.40.33; Sat, 31 Oct 2020 00:40:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726370AbgJaHjJ (ORCPT + 99 others); Sat, 31 Oct 2020 03:39:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:7015 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726337AbgJaHjI (ORCPT ); Sat, 31 Oct 2020 03:39:08 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CNWJn4ZtPzhd31; Sat, 31 Oct 2020 15:39:05 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Sat, 31 Oct 2020 15:38:57 +0800 From: Chen Zhou To: , , , , , , , , , CC: , , , , , , , , , , , , , Subject: [PATCH v13 0/8] support reserving crashkernel above 4G on arm64 kdump Date: Sat, 31 Oct 2020 15:44:29 +0800 Message-ID: <20201031074437.168008-1-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are following issues in arm64 kdump: 1. We use crashkernel=X to reserve crashkernel below 4G, which will fail when there is no enough low memory. 2. If reserving crashkernel above 4G, in this case, crash dump kernel will boot failure because there is no low memory available for allocation. 3. Since commit 1a8e1cef7603 ("arm64: use both ZONE_DMA and ZONE_DMA32"), if the memory reserved for crash dump kernel falled in ZONE_DMA32, the devices in crash dump kernel need to use ZONE_DMA will alloc fail. To solve these issues, change the behavior of crashkernel=X. crashkernel=X tries low allocation in DMA zone (or the DMA32 zone if CONFIG_ZONE_DMA is disabled), and fall back to high allocation if it fails. We can also use "crashkernel=X,high" to select a high region above DMA zone, which also tries to allocate at least 256M low memory in DMA zone automatically (or the DMA32 zone if CONFIG_ZONE_DMA is disabled). "crashkernel=Y,low" can be used to allocate specified size low memory. When reserving crashkernel in high memory, some low memory is reserved for crash dump kernel devices. So there may be two regions reserved for crash dump kernel. In order to distinct from the high region and make no effect to the use of existing kexec-tools, rename the low region as "Crash kernel (low)", and pass the low region by reusing DT property "linux,usable-memory-range". We made the low memory region as the last range of "linux,usable-memory-range" to keep compatibility with existing user-space and older kdump kernels. Besides, we need to modify kexec-tools: arm64: support more than one crash kernel regions(see [1]) Another update is document about DT property 'linux,usable-memory-range': schemas: update 'linux,usable-memory-range' node schema(see [2]) This patchset contains the following eight patches: 0001-x86-kdump-replace-the-hard-coded-alignment-with-macr.patch 0002-x86-kdump-make-the-lower-bound-of-crash-kernel-reser.patch 0003-x86-kdump-use-macro-CRASH_ADDR_LOW_MAX-in-functions-.patch 0004-x86-kdump-move-reserve_crashkernel-_low-into-crash_c.patch 0005-arm64-kdump-introduce-some-macroes-for-crash-kernel-.patch 0006-arm64-kdump-reimplement-crashkernel-X.patch 0007-arm64-kdump-add-memory-for-devices-by-DT-property-li.patch 0008-kdump-update-Documentation-about-crashkernel.patch 0001-0003 are some x86 cleanups which prepares for making functionsreserve_crashkernel[_low]() generic. 0004 makes functions reserve_crashkernel[_low]() generic. 0005-0006 reimplements arm64 crashkernel=X. 0007 adds memory for devices by DT property linux,usable-memory-range. 0008 updates the doc. Changes since [v12] - Rebased on top of 5.10-rc1. - Keep CRASH_ALIGN as 16M suggested by Dave. - Drop patch "kdump: add threshold for the required memory". - Add Tested-by from John. Changes since [v11] - Rebased on top of 5.9-rc4. - Make the function reserve_crashkernel() of x86 generic. Suggested by Catalin, make the function reserve_crashkernel() of x86 generic and arm64 use the generic version to reimplement crashkernel=X. Changes since [v10] - Reimplement crashkernel=X suggested by Catalin, Many thanks to Catalin. Changes since [v9] - Patch 1 add Acked-by from Dave. - Update patch 5 according to Dave's comments. - Update chosen schema. Changes since [v8] - Reuse DT property "linux,usable-memory-range". Suggested by Rob, reuse DT property "linux,usable-memory-range" to pass the low memory region. - Fix kdump broken with ZONE_DMA reintroduced. - Update chosen schema. Changes since [v7] - Move x86 CRASH_ALIGN to 2M Suggested by Dave and do some test, move x86 CRASH_ALIGN to 2M. - Update Documentation/devicetree/bindings/chosen.txt. Add corresponding documentation to Documentation/devicetree/bindings/chosen.txt suggested by Arnd. - Add Tested-by from Jhon and pk. Changes since [v6] - Fix build errors reported by kbuild test robot. Changes since [v5] - Move reserve_crashkernel_low() into kernel/crash_core.c. - Delete crashkernel=X,high. - Modify crashkernel=X,low. If crashkernel=X,low is specified simultaneously, reserve spcified size low memory for crash kdump kernel devices firstly and then reserve memory above 4G. In addition, rename crashk_low_res as "Crash kernel (low)" for arm64, and then pass to crash dump kernel by DT property "linux,low-memory-range". - Update Documentation/admin-guide/kdump/kdump.rst. Changes since [v4] - Reimplement memblock_cap_memory_ranges for multiple ranges by Mike. Changes since [v3] - Add memblock_cap_memory_ranges back for multiple ranges. - Fix some compiling warnings. Changes since [v2] - Split patch "arm64: kdump: support reserving crashkernel above 4G" as two. Put "move reserve_crashkernel_low() into kexec_core.c" in a separate patch. Changes since [v1]: - Move common reserve_crashkernel_low() code into kernel/kexec_core.c. - Remove memblock_cap_memory_ranges() i added in v1 and implement that in fdt_enforce_memory_region(). There are at most two crash kernel regions, for two crash kernel regions case, we cap the memory range [min(regs[*].start), max(regs[*].end)] and then remove the memory range in the middle. [1]: http://lists.infradead.org/pipermail/kexec/2020-June/020737.html [2]: https://github.com/robherring/dt-schema/pull/19 [v1]: https://lkml.org/lkml/2019/4/2/1174 [v2]: https://lkml.org/lkml/2019/4/9/86 [v3]: https://lkml.org/lkml/2019/4/9/306 [v4]: https://lkml.org/lkml/2019/4/15/273 [v5]: https://lkml.org/lkml/2019/5/6/1360 [v6]: https://lkml.org/lkml/2019/8/30/142 [v7]: https://lkml.org/lkml/2019/12/23/411 [v8]: https://lkml.org/lkml/2020/5/21/213 [v9]: https://lkml.org/lkml/2020/6/28/73 [v10]: https://lkml.org/lkml/2020/7/2/1443 [v11]: https://lkml.org/lkml/2020/8/1/150 [v12]: https://lkml.org/lkml/2020/9/7/1037 Chen Zhou (8): x86: kdump: replace the hard-coded alignment with macro CRASH_ALIGN x86: kdump: make the lower bound of crash kernel reservation consistent x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel() x86: kdump: move reserve_crashkernel[_low]() into crash_core.c arm64: kdump: introduce some macroes for crash kernel reservation arm64: kdump: reimplement crashkernel=X arm64: kdump: add memory for devices by DT property linux,usable-memory-range kdump: update Documentation about crashkernel Documentation/admin-guide/kdump/kdump.rst | 23 ++- .../admin-guide/kernel-parameters.txt | 12 +- arch/arm64/include/asm/kexec.h | 15 ++ arch/arm64/include/asm/processor.h | 1 + arch/arm64/kernel/setup.c | 13 +- arch/arm64/mm/init.c | 105 ++++------- arch/arm64/mm/mmu.c | 4 + arch/x86/include/asm/kexec.h | 28 +++ arch/x86/kernel/setup.c | 153 +--------------- include/linux/crash_core.h | 4 + include/linux/kexec.h | 2 - kernel/crash_core.c | 168 ++++++++++++++++++ kernel/kexec_core.c | 17 -- 13 files changed, 301 insertions(+), 244 deletions(-) -- 2.20.1