From patchwork Tue Mar 28 11:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 75819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1967323vqo; Mon, 27 Mar 2023 21:40:38 -0700 (PDT) X-Google-Smtp-Source: AKy350ZRTNgDTRUo6Z50sAA3mdCHhNzi/Tf8yeLB6socUOrbiDjliUh0lc/UrFSJQx6t0JfowRx3 X-Received: by 2002:aa7:8f29:0:b0:62a:d752:acc5 with SMTP id y9-20020aa78f29000000b0062ad752acc5mr12387500pfr.32.1679978438298; Mon, 27 Mar 2023 21:40:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679978438; cv=none; d=google.com; s=arc-20160816; b=SIOFYl/N8t8ZKlY2HyO2vQ3YYT7idsULmNd1b4OnFvBiAekDH7w+7cc1g5ik0kvd50 5nD6CF7v/SOEtVgqS6nf6zcxULZvqUbv2814Yql3p0JVjLxJOiaCM60GQadVzp4YAHEE C4eoXrIA0CckrCgDU4YoBpQe6KkUZWr7VntqQrFfLhvw2odwQ9JUewDEqhwnzvLGTxVV fPpkICQcJ0N5U96NJWt5lzYXrZevQww6IxmzQU9xCEL01s8amrHNF/SOSW9od7kkYrFg lSwu/hD3NMDuVPnkSDzpBujyNIWlOdzKHR3lAfme/+4bL+8Ngh+BNyiHtC4sl7JK3caf IaHQ== 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=WBxoCu0s5I5HolJJiA6BWbvs5OPfsAIFOaQuoHT73Jw=; b=g5PColAGJCdB0ZKI0yr5sZsMJCC3er33RX9RyDqLw6nAs6VRS7QYJ1G+4RwLShrqLw HtYnoGchA6oYoGJ3SIJ9+f1KDsXJUaIFn7zZe7g1hvKfTDfzaQxAt/r1JEF8Zo8NJ02E hMLsBIE4I8Jx2sU40HOUw0oDZQ+8RoAA5c8ATSgrXRTc/In0RrZK3mxicrVJFNakeRMK +Ih8w+gcCe0cFVKE3rb9NAP6StvrYgbETMOe50K90pJl2+urVGtOwntjbN8VCua8XWP2 aBm/oBHhD181cA6U0jHMXcOFk5t7aKctCzmiAbsI1KIqrY+zPlJX700hOjLi3hbRijd7 tc8Q== 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 k135-20020a62848d000000b0062a3e63c747si13060793pfd.197.2023.03.27.21.40.26; Mon, 27 Mar 2023 21:40:38 -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 S232809AbjC1Dz6 (ORCPT + 99 others); Mon, 27 Mar 2023 23:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232676AbjC1Dz1 (ORCPT ); Mon, 27 Mar 2023 23:55:27 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7417930CB; Mon, 27 Mar 2023 20:55:20 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Plwkc2F6ZzKvxd; Tue, 28 Mar 2023 11:52:56 +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.21; Tue, 28 Mar 2023 11:55:18 +0800 From: Chen Jiahao To: , , , , , , , , , , , CC: , , , Subject: [PATCH -next v2 1/2] riscv: kdump: Implement crashkernel=X,[high,low] Date: Tue, 28 Mar 2023 19:51:49 +0800 Message-ID: <20230328115150.2700016-2-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230328115150.2700016-1-chenjiahao16@huawei.com> References: <20230328115150.2700016-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,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?1761585070958286340?= X-GMAIL-MSGID: =?utf-8?q?1761585070958286340?= 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 --- arch/riscv/kernel/setup.c | 5 ++++ arch/riscv/mm/init.c | 63 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 4 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..b7708cc467fa 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,6 +1185,7 @@ 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(); @@ -1182,8 +1205,30 @@ static void __init reserve_crashkernel(void) ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); - if (ret || !crash_size) + if (ret == -ENOENT) { + /* + * crashkernel=X,[high,low] can be specified or not, but + * invalid value is not allowed. + */ + ret = parse_crashkernel_high(boot_command_line, 0, &crash_size, &crash_base); + if (ret || !crash_size) + return; + + /* + * crashkernel=Y,low is valid only when crashkernel=X,high + * is passed and high memory is reserved successful. + */ + ret = parse_crashkernel_low(boot_command_line, 0, &crash_low_size, &crash_base); + if (ret == -ENOENT) + crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE; + else if (ret) + return; + + search_start = dma32_phys_limit; + } else if (ret || !crash_size) { + /* Invalid argument value specified */ return; + } crash_size = PAGE_ALIGN(crash_size); @@ -1201,16 +1246,26 @@ 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, (unsigned long)dma32_phys_limit)); if (crash_base == 0) { - /* Try again without restricting region to 32bit addressible memory */ + /* 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, (unsigned long)dma32_phys_limit), + 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 Tue Mar 28 11:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 75809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1954185vqo; Mon, 27 Mar 2023 21:01:22 -0700 (PDT) X-Google-Smtp-Source: AKy350ZhyshySIWZzLUKayBrhswUZzdn8Cgp4fBfI0yxbwxRvNaMS6nXExJvgZ5yG5scYLPOjyCf X-Received: by 2002:aa7:c397:0:b0:4fe:e851:af4a with SMTP id k23-20020aa7c397000000b004fee851af4amr13149354edq.39.1679976081891; Mon, 27 Mar 2023 21:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679976081; cv=none; d=google.com; s=arc-20160816; b=qEpr6MNsDyM4gaQ0aVZhVjZb92bJWGFi1k/hAOj/zKkgctMV6ptr6aFP3Nuxs7AhWI LSY78BChhcL5un/ePpz0zsAzv4s+fORIHF6dg7Q5jtQrRneoSI3B7Dh6Q0rGeLxvSZ4P CMve+2IQgzccYiK3EQPURMcC7i08gnhE0xHxj//TpaogMNZG8NIBEWNdEUK1Jqhah+wf ypsfXcgehToXafeZzt+ooONV9wsTm0MyeVDlR61/IiKRlNedTvQSHFFNnGukqUfc55li r2k4DFsYyoqEQipPpBN7iCeY8Qs++8fJw5wy/O0bURTtuK1P3i3uwOu0liwbU9UyWW5E +JwQ== 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=XbdLHznSuuL+sKcVvgRgRpgSHvfQoF64zwucpQipNJI=; b=M1H4JfLiy8aq6O8/2Cidnj376CTzo1CM/d0ztG+g7oCEi/poRLb8kS+08tPFt2ZW+s qcxA4odI5xm7xdbWobitPE813QeBt7gbNw5y/4C6tmoXTb/8mtmAeJ9l7bRI8cYN+9QJ +u6XsGww1HjVho/obFr4g529X022nVzmGvyn25/bgUnJa40k3NPmPdw3c0inUtMllSZ/ 40dfWkQhMKOatYAX6N84PfBuFdGxxzq4EDT/LYWegvSm0oXXSwOMnxPYgUgLzk7MD65E tpC04eHGiFx6KnA4IlFhGeTJWBmP2fiRp3qKMFUXMrPwpyero/dEgUYRyMzvbItExxGj SVaA== 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 f17-20020a50ee91000000b004c0b7e61b21si8141448edr.365.2023.03.27.21.00.56; Mon, 27 Mar 2023 21:01:21 -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 S232600AbjC1Dzv (ORCPT + 99 others); Mon, 27 Mar 2023 23:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232487AbjC1Dz0 (ORCPT ); Mon, 27 Mar 2023 23:55:26 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E016199A; Mon, 27 Mar 2023 20:55:20 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Plwmp43LRzKpkX; Tue, 28 Mar 2023 11:54:50 +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.21; Tue, 28 Mar 2023 11:55:18 +0800 From: Chen Jiahao To: , , , , , , , , , , , CC: , , , Subject: [PATCH -next v2 2/2] docs: kdump: Update the crashkernel description for riscv Date: Tue, 28 Mar 2023 19:51:50 +0800 Message-ID: <20230328115150.2700016-3-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230328115150.2700016-1-chenjiahao16@huawei.com> References: <20230328115150.2700016-1-chenjiahao16@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,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?1761582599654845412?= X-GMAIL-MSGID: =?utf-8?q?1761582599654845412?= 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 --- 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 9bc3813bce8f..a947d3d7c85c 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.