From patchwork Wed Jul 26 17:49:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Jiahao X-Patchwork-Id: 12638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp315906vqo; Wed, 26 Jul 2023 03:57:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbIp4OpH47hJJkMoCY2uxUUrz6Nzv+BpwQdlZK3jxoJtSIUgxIXfPfmhRdo5x+c5t9VYqH X-Received: by 2002:a05:6808:189a:b0:3a4:248:6ced with SMTP id bi26-20020a056808189a00b003a402486cedmr2247480oib.14.1690369067797; Wed, 26 Jul 2023 03:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690369067; cv=none; d=google.com; s=arc-20160816; b=tzQURub9Jh2405LlvGzUHsnZoKkyRuZXBHm5QUn3C7aVd4pHZdZ3N/WLBA47kq6Yfl XWQXySYwvK+j77MtLfePvmTuz9Kkx4dlBHL1xxyOWMIyAqPru3P6EuUPoFInZK1mfnnf E5eVK/m4ndbRZ8qmimglwz/9EDgUVpi9HaDPEixH5I/2zzUHoNp3K9Dwk9ivGsMGmjxG beIpnsBv/SPvBhlnLWzHzTSLb5ifQllxw0D69byscJtp7tGBVJ3Syhmtq3bm3H3ASyPF duCg1dX+hRd4tX4zp/ZamivrGoXqL5L5rAuMlt3nfYNZejwR/po7rMc2tShlIusirdIR mi3A== 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=IDz1+vMtEYELoIeRw3gh0YXcQPrPBmzyF2cVl0eN9To=; fh=TD5YbCkntItk1qYEC1y3hbGdmiy27JbTKcanYFTtxRU=; b=pw+NufMTML9VsnjNFRXZqE5eo6Sznu38vxOZc1d5COmugIeyfN8F0zUue5R+1SlK4B TempIqTmyeAUSlz0tCegQswd0ApJkNuzD9ZNqrcWheWfxBoUcyqVxwWS5i1FrGYWgByY 96zZGY5KTgWNd9eaoF9ibBE5avMGxM09nMVKAtT8GDSpOKD3wqzAuCPUhCnExnAR1pbr S2Hrm3ib0Zto6GL3EGIxZexAFa9AcIPJShXppTl8J3Ki70075qP/e6jghYCSOXFpvgf6 wR0UjH5aY3fMerGxGU7eBSRiB8v2llV4CdfxCPEvwz8nuLLTCLmlmt3c+bs99VlCPSfg sF0Q== 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 d23-20020a63ed17000000b005533cf1fdbfsi13317400pgi.629.2023.07.26.03.57.33; Wed, 26 Jul 2023 03:57:47 -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 S233776AbjGZJvv (ORCPT + 99 others); Wed, 26 Jul 2023 05:51:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232910AbjGZJvU (ORCPT ); Wed, 26 Jul 2023 05:51:20 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55AFC2D59; Wed, 26 Jul 2023 02:51:00 -0700 (PDT) Received: from dggpemm500016.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R9pxM1prFzLntX; Wed, 26 Jul 2023 17:48:23 +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; Wed, 26 Jul 2023 17:50:58 +0800 From: Chen Jiahao To: , , , , , , , , , , , , , , , CC: Subject: [PATCH -next v9 0/2] support allocating crashkernel above 4G explicitly on riscv Date: Wed, 26 Jul 2023 17:49:58 +0000 Message-ID: <20230726175000.2536220-1-chenjiahao16@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.67.174.205] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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_H2,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: INBOX X-GMAIL-THRID: 1772401096791182084 X-GMAIL-MSGID: 1772480435413461533 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. Hence this patchset introduces 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". Besides, there are few rules need to take notice: 1. "crashkernel=X,[high,low]" will be ignored if "crashkernel=size" is specified. 2. "crashkernel=X,low" is valid only when "crashkernel=X,high" is passed and there is enough memory to be allocated under 4G. 3. When allocating crashkernel above 4G and no "crashkernel=X,low" is specified, a 128M low memory will be allocated automatically for swiotlb bounce buffer. See Documentation/admin-guide/kernel-parameters.txt for more information. To verify loading the crashkernel, adapted kexec-tools is attached below: https://github.com/chenjh005/kexec-tools/tree/build-test-riscv-v2 Following test cases have been performed as expected: 1) crashkernel=256M //low=256M 2) crashkernel=1G //low=1G 3) crashkernel=4G //high=4G, low=128M(default) 4) crashkernel=4G crashkernel=256M,high //high=4G, low=128M(default), high is ignored 5) crashkernel=4G crashkernel=256M,low //high=4G, low=128M(default), low is ignored 6) crashkernel=4G,high //high=4G, low=128M(default) 7) crashkernel=256M,low //low=0M, invalid 8) crashkernel=4G,high crashkernel=256M,low //high=4G, low=256M 9) crashkernel=4G,high crashkernel=4G,low //high=0M, low=0M, invalid 10) crashkernel=512M@0xd0000000 //low=512M 11) crashkernel=1G,high crashkernel=0M,low //high=1G, low=0M Changes since [v9]: 1. As per Conor's comment, rebase to correct base on riscv/for-next branch. No code logic changed. Changes since [v8]: 1. Rebase to newest mainline head, not modifying any code logic. Changes since [v7]: 1. Minor refactor: move crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE into the !high branch when the first allocation fails. Not changing the result but further align with Arm64 logic, refer to Baoquan's comment. 2. Add test case "crashkernel=1G,high crashkernel=0M,low", the result also matches our expectation. Changes since [v6]: 1. Introduce the "high" flag to mark whether "crashkernel=X,high" is passed. Fix the retrying logic between "crashkernel=X,high" case and others when the first allocation attempt fails. Changes since [v5]: 1. Update the crashkernel allocation logic when crashkernel=X,high is specified. In this case, region above 4G will directly get reserved as crashkernel, rather than trying lower 32bit allocation first. Changes since [v4]: 1. Update some imprecise code comments for cmdline parsing. Changes since [v3]: 1. Update to print warning and return explicitly on failure when crashkernel=size@offset is specified. Not changing the result in this case but making the logic more straightforward. 2. Some minor cleanup. Changes since [v2]: 1. Update the allocation logic to ensure the high crashkernel region is reserved strictly above dma32_phys_limit. 2. Clean up some minor format problems. Chen Jiahao (2): riscv: kdump: Implement crashkernel=X,[high,low] docs: kdump: Update the crashkernel description for riscv .../admin-guide/kernel-parameters.txt | 15 +-- arch/riscv/kernel/setup.c | 5 + arch/riscv/mm/init.c | 93 +++++++++++++++++-- 3 files changed, 99 insertions(+), 14 deletions(-)