From patchwork Mon Apr 10 13:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 81508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1893099vqo; Mon, 10 Apr 2023 06:24:54 -0700 (PDT) X-Google-Smtp-Source: AKy350a1G1G72fvCjUEqYtEXTplljVWsA9snEiP0P99u4srhEBhSJ+t7DpAg1Ox1N3TZy88ypYI4 X-Received: by 2002:a05:6a20:be0a:b0:d9:63c3:e299 with SMTP id ge10-20020a056a20be0a00b000d963c3e299mr7120974pzb.8.1681133094623; Mon, 10 Apr 2023 06:24:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681133094; cv=none; d=google.com; s=arc-20160816; b=vo638Ji2XFjYDpRL4ejyvztlkFQ8Kn0NPvYX8raA0PLZOWxJbE9EC2gq1Oul7XIk9s TBz0CjwBkqKPK95hrimHuM8GsSm+1uJwiZxsiHRQZKtJFfh6HKWZXOWNY8bxO+KfGOyz l9pOhkftrtJ0zYWK9P3ycNAePPZQAVEBZugjQpZLytNXs6BY1/mgMMfw72TlTV/QYFqu 2ZfWStEP6hZxAEQvZpfJzuBV/nWoe4rilpDgnbZEpumt0UHiKuEhxp0opyXHKNRT2IXh KSkkBa3PrgNXLO4BZ/3tzDECoJ8E1fHDLuGoq99ZEgLtMrpxbTCDIQws7Ve94MZ3FBVS 2hcA== 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=xh8zblZXjsn0MhdgXB+8WDcIT5/24L9wQoMNFq7M5DM=; b=jIBS9T+ZI5ztgX3XHSI+/ErXldvoMtZKwgszOlbJLUUVPYg7ZYghToyio3T+elKMpk 83e7BBt7KfLncYAJV7Nipe/vxXtru1bfLWLdLHbEeHtIzl9WP9WktaEPXkHoGTu+eXI3 u8aESh/EFVMZz8LUiRWIKBZInTZmVsC65v2BXXckv2Iyl3WcFER5NO2IvWXJZdN6Y/gy BQTufY+x/r+AkOB/Ob0eY5XmICg1wgmEYntU1iOXF/AtPoJgDrpGTk+6vLnnKfj8ZHIa qA+bX/xUrKc5WzVeGiyEhlaiJf0AT3Lb8WusrlXLEBxeDcjN/hQoD3TDq7ZUqHUfhMCF f7IQ== 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 79-20020a630252000000b005145fbb2dcasi9850207pgc.780.2023.04.10.06.24.39; Mon, 10 Apr 2023 06:24:54 -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 S229772AbjDJNGM (ORCPT + 99 others); Mon, 10 Apr 2023 09:06:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbjDJNGK (ORCPT ); Mon, 10 Apr 2023 09:06:10 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE8CF4488; Mon, 10 Apr 2023 06:06:07 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Pw8Jk729bz17Rw5; Mon, 10 Apr 2023 21:02: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.23; Mon, 10 Apr 2023 21:06:02 +0800 From: Chen Jiahao To: , , , CC: , , , , , , , , , , , Subject: [PATCH -next v4 1/2] riscv: kdump: Implement crashkernel=X,[high,low] Date: Mon, 10 Apr 2023 21:05:52 +0800 Message-ID: <20230410130553.3226347-2-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230410130553.3226347-1-chenjiahao16@huawei.com> References: <20230410130553.3226347-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762795815735923852?= X-GMAIL-MSGID: =?utf-8?q?1762795815735923852?= 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 Reviewed-by: Zhen Lei Reviewed-by: Simon Horman --- arch/riscv/kernel/setup.c | 5 +++ arch/riscv/mm/init.c | 71 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 5d3184cbf518..ea84e5047c23 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -176,6 +176,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 478d6763a01a..70f6cb281ed1 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1152,6 +1152,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 * @@ -1163,8 +1185,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_low_max = (unsigned long)dma32_phys_limit; + char *cmdline = boot_command_line; + bool fixed_base = false; int ret = 0; @@ -1180,14 +1206,34 @@ 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 = search_low_max; + } 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; } @@ -1201,16 +1247,31 @@ static void __init reserve_crashkernel(void) */ crash_base = memblock_phys_alloc_range(crash_size, PMD_SIZE, search_start, - min(search_end, (unsigned long) SZ_4G)); + min(search_end, search_low_max)); if (crash_base == 0) { - /* Try again without restricting region to 32bit addressible memory */ + if (fixed_base) { + pr_warn("crashkernel: allocating failed with given size@offset\n"); + return; + } + + /* Try again above the region of 32bit addressible memory */ crash_base = memblock_phys_alloc_range(crash_size, PMD_SIZE, - search_start, search_end); + max(search_start, search_low_max), + search_end); if (crash_base == 0) { pr_warn("crashkernel: couldn't allocate %lldKB\n", crash_size >> 10); return; } + + if (!crash_low_size) + crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE; + } + + if ((crash_base > dma32_phys_limit - crash_low_size) && + 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", From patchwork Mon Apr 10 13:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 81512 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1903695vqo; Mon, 10 Apr 2023 06:42:38 -0700 (PDT) X-Google-Smtp-Source: AKy350YCTDjc8GdajVF1OigK/VoPoBrah0M+YwrZBEqasC+9FcMt+GZg4+PtvQvSO+FGday19OlL X-Received: by 2002:a17:906:2acc:b0:947:40e6:fde3 with SMTP id m12-20020a1709062acc00b0094740e6fde3mr6474387eje.35.1681134157981; Mon, 10 Apr 2023 06:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681134157; cv=none; d=google.com; s=arc-20160816; b=KV4KA7urhzQGu4Qr3yIsK/PfovA+iJlzIFz90kLp9KaaUcXsremT+HA/qT4JIAmZsB rgHoIHfT86dHbVsRwKlD9LSZ8Tn0jwa6Jg/Lh3c0qfadL3NH6CYtbC1sQf4dsMb8ii48 HFecc84qjYn2PkvZVar5rLNuvnqJbro5YmR7X26AcsKFW5LkN3DEgm7cxjnoAbxbnbIN v+ty9Cb5XtQ8k973jOATs5noLC1mw1Xyjh6UJwY2Z0P1l8eIa2IRXUDGNFRIM3tJ/S2y JsL79FDBQzjKwjBZt9QcIy6Vls8GPZHbtRUzyHSvo13Ob3F5+2Dn/rFvJGLcvAkIvOq+ S3VQ== 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=8VoPeAI5uafFCC30npE7g5g3vifTmXYMxE9ugBZqD2c=; b=s1pDb+gVaJXZ01kmphnxVnz5F7EbOiWlUkcIjtDkwVWzIYorGoiLVgWJvsZprcoajr Z7uBPnhMjjmWJJLLzThigRnFsgJ9H2auZLEn9T8gdBqfK88716z9zw88cyrjWcbSGUNV NKPDjjYizH8jFttGsIP63KmhV5E4Oyg/HpNP1yjaCp7TA/PFk31rClo1tKiHzykQkgcp T+aRIr/bJN0XHw+sOsFSJzVbn/ncIxAUIAxp1hfX4OBcDozwLw8n6SxdNVRNEF6XJ/b+ +6NOkgXttpy7le8b5NLx2r6zb0bXlajSJ90nod4hdULNG4cI/9WAer8oe+Fp893YdpLl zKiw== 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 y7-20020a056402134700b005049c6a4a39si3399810edw.561.2023.04.10.06.42.13; Mon, 10 Apr 2023 06:42:37 -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 S229782AbjDJNGO (ORCPT + 99 others); Mon, 10 Apr 2023 09:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbjDJNGK (ORCPT ); Mon, 10 Apr 2023 09:06:10 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE80540EA; Mon, 10 Apr 2023 06:06:07 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Pw8Jl2BrNz17RwY; Mon, 10 Apr 2023 21:02:31 +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.23; Mon, 10 Apr 2023 21:06:02 +0800 From: Chen Jiahao To: , , , CC: , , , , , , , , , , , Subject: [PATCH -next v4 2/2] docs: kdump: Update the crashkernel description for riscv Date: Mon, 10 Apr 2023 21:05:53 +0800 Message-ID: <20230410130553.3226347-3-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230410130553.3226347-1-chenjiahao16@huawei.com> References: <20230410130553.3226347-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762796930840835343?= X-GMAIL-MSGID: =?utf-8?q?1762796930840835343?= 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 54702bd488eb..41865aae9eaa 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -866,7 +866,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. @@ -879,14 +879,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 @@ -897,6 +897,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.