From patchwork Tue Jul 4 21:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 115779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1224181vqx; Tue, 4 Jul 2023 06:31:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7EcFnEp49FGCpN7XCa2bAYlobmzXWiZoJEyXBPdgAWVAktv7ZMNn1QxissylqUyEevbcy0 X-Received: by 2002:aca:2b1a:0:b0:3a0:58f6:c424 with SMTP id i26-20020aca2b1a000000b003a058f6c424mr13229395oik.26.1688477471621; Tue, 04 Jul 2023 06:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688477471; cv=none; d=google.com; s=arc-20160816; b=hUe1r49IyghZ52xN7M9d5u29osDdE2EDGmNyxgEiQ9zFSbVTlpAnI9NhrVaoP33mjW VCsclQF2JE7RbXVbjGQm8q0fRduzjQy+30qv5tnHNFdU1rwDsiWA4S3jMW/gI3WsDL+r bY+TSzUeLL+YUiNnPraZUBQX/qzmpgDpRvcLSVQNhn3D28YQoJaqezfmlZXUMEIXbg0v Hj/d3SRzG7G3V76QmVg/L9CkCl5v3vv7weNnsxjmxIP2jh9GG0hg/vk8v3oj7MxuZrXj ZnD8yqug7AwYaInhvAntq+I0SMwsu9kO6k7L7ZxR9qrSPEKpQW0fkgWf44IwwI212EPP m2+w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Bqr4ZmmS7UL1WX9Z0H0YzUMje6k7aW1V4WkBuHHlWMM=; fh=cZzYYpN1nZpAxk4UoHdRoA1SaA1Nj1t0H9BxdESBAa8=; b=O/1tf8HiJ7mMakuKRz+NpqAvxC2z0ABo87L1TqTMAAmEuvjIYPqCtCMhUk4PHPM4c/ lXdiK1XAb9yuweRbqtCIR74Qx6ap4EKQPoCsjSKBxyhKVGPO2sHiGdjwD//weJ+IFxNg EeoMsdZdqqKRBb0KVGYtgnUNR7f5KW0BurUEQuJ04UD5e8lsO+GYDu95CsGocZxy9+vL wCHDObXDVVEjxxK2w16st+t3RTWbWVI9iv1VBJ6D5Ewccry6qpZp+pj+ytC1+6GBlSjM ZQxQoBmCjXAoD96WToh7bzIVpBGK3doHb2SvPAV8T4OsDsIQoh6JU6htBRsHuy3oru6y CV7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nl2-20020a17090b384200b00263ad259d9esi7073826pjb.0.2023.07.04.06.30.52; Tue, 04 Jul 2023 06:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231540AbjGDNYE (ORCPT + 99 others); Tue, 4 Jul 2023 09:24:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbjGDNYB (ORCPT ); Tue, 4 Jul 2023 09:24:01 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ADFD100; Tue, 4 Jul 2023 06:23:58 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QwNlk5RCZz1HCjW; Tue, 4 Jul 2023 21:23:30 +0800 (CST) Received: from huawei.com (10.67.174.205) by dggpemm500016.china.huawei.com (7.185.36.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 4 Jul 2023 21:23:54 +0800 From: Chen Jiahao To: , , , CC: , , , , , , , , , , , Subject: [PATCH -next v7 1/2] riscv: kdump: Implement crashkernel=X,[high,low] Date: Tue, 4 Jul 2023 21:23:26 +0000 Message-ID: <20230704212327.1687310-2-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230704212327.1687310-1-chenjiahao16@huawei.com> References: <20230704212327.1687310-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770496953200089504?= X-GMAIL-MSGID: =?utf-8?q?1770496953200089504?= On riscv, the current crash kernel allocation logic is trying to allocate within 32bit addressible memory region by default, if failed, try to allocate without 4G restriction. In need of saving DMA zone memory while allocating a relatively large crash kernel region, allocating the reserved memory top down in high memory, without overlapping the DMA zone, is a mature solution. Here introduce the parameter option crashkernel=X,[high,low]. One can reserve the crash kernel from high memory above DMA zone range by explicitly passing "crashkernel=X,high"; or reserve a memory range below 4G with "crashkernel=X,low". Signed-off-by: Chen Jiahao Acked-by: Guo Ren --- arch/riscv/kernel/setup.c | 5 +++ arch/riscv/mm/init.c | 93 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 971fe776e2f8..376f5d49ce85 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -178,6 +178,11 @@ static void __init init_resources(void) if (ret < 0) goto error; } + if (crashk_low_res.start != crashk_low_res.end) { + ret = add_resource(&iomem_resource, &crashk_low_res); + if (ret < 0) + goto error; + } #endif #ifdef CONFIG_CRASH_DUMP diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 4b95d8999120..7e808f413ed3 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1298,6 +1298,28 @@ static inline void setup_vm_final(void) } #endif /* CONFIG_MMU */ +/* Reserve 128M low memory by default for swiotlb buffer */ +#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20) + +static int __init reserve_crashkernel_low(unsigned long long low_size) +{ + unsigned long long low_base; + + low_base = memblock_phys_alloc_range(low_size, PMD_SIZE, 0, dma32_phys_limit); + if (!low_base) { + pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size); + return -ENOMEM; + } + + pr_info("crashkernel low memory reserved: 0x%016llx - 0x%016llx (%lld MB)\n", + low_base, low_base + low_size, low_size >> 20); + + crashk_low_res.start = low_base; + crashk_low_res.end = low_base + low_size - 1; + + return 0; +} + /* * reserve_crashkernel() - reserves memory for crash kernel * @@ -1309,8 +1331,12 @@ static void __init reserve_crashkernel(void) { unsigned long long crash_base = 0; unsigned long long crash_size = 0; + unsigned long long crash_low_size = 0; unsigned long search_start = memblock_start_of_DRAM(); - unsigned long search_end = memblock_end_of_DRAM(); + unsigned long search_end = (unsigned long)dma32_phys_limit; + char *cmdline = boot_command_line; + bool fixed_base = false; + bool high = false; int ret = 0; @@ -1326,14 +1352,36 @@ static void __init reserve_crashkernel(void) return; } - ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), + ret = parse_crashkernel(cmdline, memblock_phys_mem_size(), &crash_size, &crash_base); - if (ret || !crash_size) + if (ret == -ENOENT) { + /* Fallback to crashkernel=X,[high,low] */ + ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base); + if (ret || !crash_size) + return; + + /* + * crashkernel=Y,low is valid only when crashkernel=X,high + * is passed. + */ + ret = parse_crashkernel_low(cmdline, 0, &crash_low_size, &crash_base); + if (ret == -ENOENT) + crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE; + else if (ret) + return; + + search_start = (unsigned long)dma32_phys_limit; + search_end = memblock_end_of_DRAM(); + high = true; + } else if (ret || !crash_size) { + /* Invalid argument value specified */ return; + } crash_size = PAGE_ALIGN(crash_size); if (crash_base) { + fixed_base = true; search_start = crash_base; search_end = crash_base + crash_size; } @@ -1346,12 +1394,37 @@ static void __init reserve_crashkernel(void) * swiotlb can work on the crash kernel. */ crash_base = memblock_phys_alloc_range(crash_size, PMD_SIZE, - search_start, - min(search_end, (unsigned long) SZ_4G)); + search_start, search_end); if (crash_base == 0) { - /* Try again without restricting region to 32bit addressible memory */ + /* + * For crashkernel=size[KMG]@offset[KMG], print out failure + * message if can't reserve the specified region. + */ + if (fixed_base) { + pr_warn("crashkernel: allocating failed with given size@offset\n"); + return; + } + + if (high) { + /* + * For crashkernel=size[KMG],high, if the first attempt was + * for high memory, fall back to low memory. + */ + search_start = memblock_start_of_DRAM(); + search_end = (unsigned long)dma32_phys_limit; + } else { + /* + * For crashkernel=size[KMG], if the first attempt was for + * low memory, fall back to high memory, the minimum required + * low memory will be reserved later. + */ + search_start = (unsigned long)dma32_phys_limit; + search_end = memblock_end_of_DRAM(); + crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE; + } + crash_base = memblock_phys_alloc_range(crash_size, PMD_SIZE, - search_start, search_end); + search_start, search_end); if (crash_base == 0) { pr_warn("crashkernel: couldn't allocate %lldKB\n", crash_size >> 10); @@ -1359,6 +1432,12 @@ static void __init reserve_crashkernel(void) } } + if ((crash_base >= dma32_phys_limit) && crash_low_size && + reserve_crashkernel_low(crash_low_size)) { + memblock_phys_free(crash_base, crash_size); + return; + } + pr_info("crashkernel: reserved 0x%016llx - 0x%016llx (%lld MB)\n", crash_base, crash_base + crash_size, crash_size >> 20); From patchwork Tue Jul 4 21:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 115787 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1229797vqx; Tue, 4 Jul 2023 06:39:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdjpvS89LnDKaRGSzxaO/H+kbwGZjpMPVBfDE1eGA6wCGbFUgi7nRLvgeLD+efRTIvY9Cr X-Received: by 2002:a17:903:124c:b0:1b3:d11c:23ca with SMTP id u12-20020a170903124c00b001b3d11c23camr12032968plh.8.1688477991268; Tue, 04 Jul 2023 06:39:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688477991; cv=none; d=google.com; s=arc-20160816; b=KE08JyNMp2CDdH7qdRuV9brk7bsK1VCIZjaL2dGfVfYJuH/TiQFNKmD7xuDwaJEAut Myq/kL+7rwqF7o9L9eQngk7KdqsZnaazwa74kFTqzg3DRCOwXg9LtxNpVadMDv5AjBqb iq+JNlmIMFTMBPF+vCQljrbTHVbWmapZTdx49YKVLIc68LOdNOddkm8GvwH5aHS0OfDx OvYIjVpXcibTbAAYukqHMXOEi3VLf1vXl6fGQGAgD8vBZNRsFN1XQ5YpNL8nE3dGyHCT Bkp/oD2yZXvKOrYhh1fISw2eoT7ORXyUltdWgtIw5+aKzJ1DO1/iTtNCG5T1QhdmpsKl iXCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=9LcjgTX5GYnTJ6Hzx/yuRvlBBoH8j2LLQaltia+FyYY=; fh=cZzYYpN1nZpAxk4UoHdRoA1SaA1Nj1t0H9BxdESBAa8=; b=CMb3jQ+7yJhfbPMyl+KD1N6SKruCDx0XsxR9vg2yj7Q8nHgn4gWrZico9CpadXmpBf wwZ4+hzJM0w5vfgYJIAWtpq0UP2IghJKE5CVA/VNTI7NxGl7JeQVgSVJlUYJUgzz5Gg4 fE+pmJgtk+mnbjSMNzqcI665oCfSzpJhMXYmzeGG8HENQKe1ILKn1F+x238vfV3cGiAR 5K298YPnn+ivfAoh04yKt0AKPf/Hzq4LLmeyMSubUdhse5GULI6Ts78m5SKPMAKc0MMx FBBXhFnSAjDjWMnNyawzzL5vJLp8TFNX7FMFE72/OVo/S9EncrmlvluTB0xc2NlNz2RB WX8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q22-20020a170902789600b001a52db202c7si19356604pll.382.2023.07.04.06.39.36; Tue, 04 Jul 2023 06:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231601AbjGDNYL (ORCPT + 99 others); Tue, 4 Jul 2023 09:24:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231491AbjGDNYE (ORCPT ); Tue, 4 Jul 2023 09:24:04 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AD2DF3; Tue, 4 Jul 2023 06:24:01 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QwNlk1QqxzqSGr; Tue, 4 Jul 2023 21:23:30 +0800 (CST) Received: from huawei.com (10.67.174.205) by dggpemm500016.china.huawei.com (7.185.36.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 4 Jul 2023 21:23:55 +0800 From: Chen Jiahao To: , , , CC: , , , , , , , , , , , Subject: [PATCH -next v7 2/2] docs: kdump: Update the crashkernel description for riscv Date: Tue, 4 Jul 2023 21:23:27 +0000 Message-ID: <20230704212327.1687310-3-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230704212327.1687310-1-chenjiahao16@huawei.com> References: <20230704212327.1687310-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770497497934753654?= X-GMAIL-MSGID: =?utf-8?q?1770497497934753654?= Now "crashkernel=" parameter on riscv has been updated to support crashkernel=X,[high,low]. Through which we can reserve memory region above/within 32bit addressible DMA zone. Here update the parameter description accordingly. Signed-off-by: Chen Jiahao Reviewed-by: Guo Ren Reviewed-by: Simon Horman Reviewed-by: Zhen Lei --- Documentation/admin-guide/kernel-parameters.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a1457995fd41..bd519749968f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -862,7 +862,7 @@ memory region [offset, offset + size] for that kernel image. If '@offset' is omitted, then a suitable offset is selected automatically. - [KNL, X86-64, ARM64] Select a region under 4G first, and + [KNL, X86-64, ARM64, RISCV] Select a region under 4G first, and fall back to reserve region above 4G when '@offset' hasn't been specified. See Documentation/admin-guide/kdump/kdump.rst for further details. @@ -875,14 +875,14 @@ Documentation/admin-guide/kdump/kdump.rst for an example. crashkernel=size[KMG],high - [KNL, X86-64, ARM64] range could be above 4G. Allow kernel - to allocate physical memory region from top, so could - be above 4G if system have more than 4G ram installed. - Otherwise memory region will be allocated below 4G, if - available. + [KNL, X86-64, ARM64, RISCV] range could be above 4G. + Allow kernel to allocate physical memory region from top, + so could be above 4G if system have more than 4G ram + installed. Otherwise memory region will be allocated + below 4G, if available. It will be ignored if crashkernel=X is specified. crashkernel=size[KMG],low - [KNL, X86-64, ARM64] range under 4G. When crashkernel=X,high + [KNL, X86-64, ARM64, RISCV] range under 4G. When crashkernel=X,high is passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb @@ -893,6 +893,7 @@ size is platform dependent. --> x86: max(swiotlb_size_or_default() + 8MiB, 256MiB) --> arm64: 128MiB + --> riscv: 128MiB This one lets the user specify own low range under 4G for second kernel instead. 0: to disable low allocation.