From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6BF3C433FE for ; Thu, 13 Jan 2022 01:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231263AbiAMBRo (ORCPT ); Wed, 12 Jan 2022 20:17:44 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]:16706 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbiAMBRm (ORCPT ); Wed, 12 Jan 2022 20:17:42 -0500 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4JZ5zv0ktWzZfB8; Thu, 13 Jan 2022 09:14:03 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 09:17:40 +0800 Received: from [10.174.178.55] (10.174.178.55) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 09:17:39 +0800 Subject: Re: [PATCH v19 11/13] arm64: kdump: reimplement crashkernel=X To: Dave Kleikamp , Thomas Gleixner , Ingo Molnar , Borislav Petkov , , "H . Peter Anvin" , , Dave Young , Baoquan He , Vivek Goyal , Eric Biederman , , Catalin Marinas , Will Deacon , , Rob Herring , Frank Rowand , , "Jonathan Corbet" , CC: Randy Dunlap , Feng Zhou , Kefeng Wang , "Chen Zhou" , John Donnelly References: <20211228132612.1860-1-thunder.leizhen@huawei.com> <20211228132612.1860-12-thunder.leizhen@huawei.com> From: "Leizhen (ThunderTown)" Message-ID: <6bcea8a4-c244-bb0c-ff55-92cbe463b4cc@huawei.com> Date: Thu, 13 Jan 2022 09:17:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.178.55] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/1/12 22:45, Dave Kleikamp wrote: > On 12/28/21 7:26AM, Zhen Lei wrote: >> From: Chen Zhou >> >> 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. >> >> To solve these issues, change the behavior of crashkernel=X and >> introduce crashkernel=X,[high,low]. crashkernel=X tries low allocation >> in DMA zone, and fall back to high allocation if it fails. >> We can also use "crashkernel=X,high" to select a region above DMA zone, >> which also tries to allocate at least 256M in DMA zone automatically. >> "crashkernel=Y,low" can be used to allocate specified size low memory. >> >> Another minor change, 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)". >> >> Signed-off-by: Chen Zhou >> Co-developed-by: Zhen Lei >> Signed-off-by: Zhen Lei >> --- >>   arch/arm64/kernel/machine_kexec.c      |  5 +++- >>   arch/arm64/kernel/machine_kexec_file.c | 12 ++++++-- >>   arch/arm64/kernel/setup.c              | 13 +++++++- >>   arch/arm64/mm/init.c                   | 41 ++++++++++---------------- >>   4 files changed, 42 insertions(+), 29 deletions(-) >> >> diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c >> index 6fb31c117ebe08c..6665bf31f6b6a19 100644 >> --- a/arch/arm64/kernel/machine_kexec.c >> +++ b/arch/arm64/kernel/machine_kexec.c >> @@ -327,7 +327,10 @@ bool crash_is_nosave(unsigned long pfn) >>         /* in reserved memory? */ >>       addr = __pfn_to_phys(pfn); >> -    if ((addr < crashk_res.start) || (crashk_res.end < addr)) >> +    if (((addr < crashk_res.start) || (crashk_res.end < addr)) && !crashk_low_res.end) >> +        return false; >> + >> +    if ((addr < crashk_low_res.start) || (crashk_low_res.end < addr)) >>           return false; >>         if (!kexec_crash_image) >> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c >> index 59c648d51848886..889951291cc0f9c 100644 >> --- a/arch/arm64/kernel/machine_kexec_file.c >> +++ b/arch/arm64/kernel/machine_kexec_file.c >> @@ -65,10 +65,18 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) >>         /* Exclude crashkernel region */ >>       ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); >> +    if (ret) >> +        goto out; >> + >> +    if (crashk_low_res.end) { >> +        ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); >> +        if (ret) >> +            goto out; >> +    } >>   -    if (!ret) >> -        ret =  crash_prepare_elf64_headers(cmem, true, addr, sz); >> +    ret = crash_prepare_elf64_headers(cmem, true, addr, sz); >>   +out: >>       kfree(cmem); >>       return ret; >>   } >> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c >> index be5f85b0a24de69..4bb2e55366be64d 100644 >> --- a/arch/arm64/kernel/setup.c >> +++ b/arch/arm64/kernel/setup.c >> @@ -248,7 +248,18 @@ static void __init request_standard_resources(void) >>               kernel_data.end <= res->end) >>               request_resource(res, &kernel_data); >>   #ifdef CONFIG_KEXEC_CORE >> -        /* Userspace will find "Crash kernel" region in /proc/iomem. */ >> +        /* >> +         * Userspace will find "Crash kernel" or "Crash kernel (low)" >> +         * region in /proc/iomem. >> +         * 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)". >> +         */ >> +        if (crashk_low_res.end && crashk_low_res.start >= res->start && >> +                crashk_low_res.end <= res->end) { >> +            crashk_low_res.name = "Crash kernel (low)"; >> +            request_resource(res, &crashk_low_res); >> +        } >>           if (crashk_res.end && crashk_res.start >= res->start && >>               crashk_res.end <= res->end) >>               request_resource(res, &crashk_res); >> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c >> index be4595dc7459115..91b8038a1529068 100644 >> --- a/arch/arm64/mm/init.c >> +++ b/arch/arm64/mm/init.c >> @@ -74,41 +74,32 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init; >>    */ >>   static void __init reserve_crashkernel(void) >>   { >> -    unsigned long long crash_base, crash_size; >> -    unsigned long long crash_max = CRASH_ADDR_LOW_MAX; >> +    unsigned long long crash_size, crash_base, total_mem, low_size; > > low_size needs to be initialized to -1. > > If parse_crashkernel() succeeds, then an uninitialized low_size will be passed to reserve_crashkernel_mem(). Right, thanks, I noticed that too. I'm waiting for v5.17-rc1 to release v20. In addition, I found that the current implementation on x86 was problematic in case "crashkernel=4G crashkernel=512M,low". According to the document, "crashkernel=512M,low" should not take effect at this case. But reserve_crashkernel_low() didn't do that well. > >> +    bool high = false; >>       int ret; >>   -    ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), >> -                &crash_size, &crash_base); >> -    /* no crashkernel= or invalid value specified */ >> -    if (ret || !crash_size) >> -        return; >> - >> -    crash_size = PAGE_ALIGN(crash_size); >> - >> -    /* User specifies base address explicitly. */ >> -    if (crash_base) >> -        crash_max = crash_base + crash_size; >> +    total_mem = memblock_phys_mem_size(); >>   -    /* Current arm64 boot protocol requires 2MB alignment */ >> -    crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN, >> -                           crash_base, crash_max); >> -    if (!crash_base) { >> -        pr_warn("cannot allocate crashkernel (size:0x%llx)\n", >> -            crash_size); >> -        return; >> +    ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base); >> +    if (ret != 0 || crash_size <= 0) { >> +        /* crashkernel=X,high and possible crashkernel=Y,low */ >> +        ret = parse_crashkernel_high_low(boot_command_line, &crash_size, &low_size); >> +        if (ret) >> +            return; >> +        high = true; >>       } >>   -    pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n", >> -        crash_base, crash_base + crash_size, crash_size >> 20); >> +    ret = reserve_crashkernel_mem(total_mem, crash_size, crash_base, low_size, high); >> +    if (ret) >> +        return; >>         /* >>        * The crashkernel memory will be removed from the kernel linear >>        * map. Inform kmemleak so that it won't try to access it. >>        */ >> -    kmemleak_ignore_phys(crash_base); >> -    crashk_res.start = crash_base; >> -    crashk_res.end = crash_base + crash_size - 1; >> +    kmemleak_ignore_phys(crashk_res.start); >> +    if (crashk_low_res.end) >> +        kmemleak_ignore_phys(crashk_low_res.start); >>   } >>   #else >>   static void __init reserve_crashkernel(void) > > . > -- Regards, Zhen Lei From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD170C433EF for ; Thu, 13 Jan 2022 01:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=O4zmh9Eb8FsJ2ArPBcGK7YQjewnA6yz/B8nKhL/Xz38=; b=dQv16TXqjJxexPO19ldOELExEF iKlVf8Vub8ohIGzREwHUxVehmG8Ejv4sTUbbLqQp+2yXyO2nVz8ZxwvfvnjyqzO6gkVxpLmZN7eeL 8CWtbbQLX6k5KIE7GfmQid4gzc2kI/2eiT8GQxbIHzScIebP7OBUEiawJY+1cwJH61RAXiKUC+vcB npOKOvi3YBgok1zzeGmYnK9+ZWZUz1++T7bhTdJpJZsrhCW5dth3NayNtNqdTlruK7LZKcFuPObur QMYd4swe2zxzcK3BzFfersjASfsOsx4CZZepJq+VTa7jOheEYdsCXJIozUEJD5O65NOoZKDWRoh6h +bjIyzVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7okY-004Ces-1J; Thu, 13 Jan 2022 01:17:58 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7okR-004Ccj-3K; Thu, 13 Jan 2022 01:17:53 +0000 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4JZ5zv0ktWzZfB8; Thu, 13 Jan 2022 09:14:03 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 09:17:40 +0800 Received: from [10.174.178.55] (10.174.178.55) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 13 Jan 2022 09:17:39 +0800 Subject: Re: [PATCH v19 11/13] arm64: kdump: reimplement crashkernel=X To: Dave Kleikamp , Thomas Gleixner , Ingo Molnar , Borislav Petkov , , "H . Peter Anvin" , , Dave Young , Baoquan He , Vivek Goyal , Eric Biederman , , Catalin Marinas , Will Deacon , , Rob Herring , Frank Rowand , , "Jonathan Corbet" , CC: Randy Dunlap , Feng Zhou , Kefeng Wang , "Chen Zhou" , John Donnelly References: <20211228132612.1860-1-thunder.leizhen@huawei.com> <20211228132612.1860-12-thunder.leizhen@huawei.com> From: "Leizhen (ThunderTown)" Message-ID: <6bcea8a4-c244-bb0c-ff55-92cbe463b4cc@huawei.com> Date: Thu, 13 Jan 2022 09:17:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [10.174.178.55] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_171751_499743_EB9289ED X-CRM114-Status: GOOD ( 25.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CgpPbiAyMDIyLzEvMTIgMjI6NDUsIERhdmUgS2xlaWthbXAgd3JvdGU6Cj4gT24gMTIvMjgvMjEg NzoyNkFNLCBaaGVuIExlaSB3cm90ZToKPj4gRnJvbTogQ2hlbiBaaG91IDxjaGVuemhvdTEwQGh1 YXdlaS5jb20+Cj4+Cj4+IFRoZXJlIGFyZSBmb2xsb3dpbmcgaXNzdWVzIGluIGFybTY0IGtkdW1w Ogo+PiAxLiBXZSB1c2UgY3Jhc2hrZXJuZWw9WCB0byByZXNlcnZlIGNyYXNoa2VybmVsIGJlbG93 IDRHLCB3aGljaAo+PiB3aWxsIGZhaWwgd2hlbiB0aGVyZSBpcyBubyBlbm91Z2ggbG93IG1lbW9y eS4KPj4gMi4gSWYgcmVzZXJ2aW5nIGNyYXNoa2VybmVsIGFib3ZlIDRHLCBpbiB0aGlzIGNhc2Us IGNyYXNoIGR1bXAKPj4ga2VybmVsIHdpbGwgYm9vdCBmYWlsdXJlIGJlY2F1c2UgdGhlcmUgaXMg bm8gbG93IG1lbW9yeSBhdmFpbGFibGUKPj4gZm9yIGFsbG9jYXRpb24uCj4+Cj4+IFRvIHNvbHZl IHRoZXNlIGlzc3VlcywgY2hhbmdlIHRoZSBiZWhhdmlvciBvZiBjcmFzaGtlcm5lbD1YIGFuZAo+ PiBpbnRyb2R1Y2UgY3Jhc2hrZXJuZWw9WCxbaGlnaCxsb3ddLiBjcmFzaGtlcm5lbD1YIHRyaWVz IGxvdyBhbGxvY2F0aW9uCj4+IGluIERNQSB6b25lLCBhbmQgZmFsbCBiYWNrIHRvIGhpZ2ggYWxs b2NhdGlvbiBpZiBpdCBmYWlscy4KPj4gV2UgY2FuIGFsc28gdXNlICJjcmFzaGtlcm5lbD1YLGhp Z2giIHRvIHNlbGVjdCBhIHJlZ2lvbiBhYm92ZSBETUEgem9uZSwKPj4gd2hpY2ggYWxzbyB0cmll cyB0byBhbGxvY2F0ZSBhdCBsZWFzdCAyNTZNIGluIERNQSB6b25lIGF1dG9tYXRpY2FsbHkuCj4+ ICJjcmFzaGtlcm5lbD1ZLGxvdyIgY2FuIGJlIHVzZWQgdG8gYWxsb2NhdGUgc3BlY2lmaWVkIHNp emUgbG93IG1lbW9yeS4KPj4KPj4gQW5vdGhlciBtaW5vciBjaGFuZ2UsIHRoZXJlIG1heSBiZSB0 d28gcmVnaW9ucyByZXNlcnZlZCBmb3IgY3Jhc2gKPj4gZHVtcCBrZXJuZWwsIGluIG9yZGVyIHRv IGRpc3RpbmN0IGZyb20gdGhlIGhpZ2ggcmVnaW9uIGFuZCBtYWtlIG5vCj4+IGVmZmVjdCB0byB0 aGUgdXNlIG9mIGV4aXN0aW5nIGtleGVjLXRvb2xzLCByZW5hbWUgdGhlIGxvdyByZWdpb24gYXMK Pj4gIkNyYXNoIGtlcm5lbCAobG93KSIuCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IENoZW4gWmhvdSA8 Y2hlbnpob3UxMEBodWF3ZWkuY29tPgo+PiBDby1kZXZlbG9wZWQtYnk6IFpoZW4gTGVpIDx0aHVu ZGVyLmxlaXpoZW5AaHVhd2VpLmNvbT4KPj4gU2lnbmVkLW9mZi1ieTogWmhlbiBMZWkgPHRodW5k ZXIubGVpemhlbkBodWF3ZWkuY29tPgo+PiAtLS0KPj4gwqAgYXJjaC9hcm02NC9rZXJuZWwvbWFj aGluZV9rZXhlYy5jwqDCoMKgwqDCoCB8wqAgNSArKystCj4+IMKgIGFyY2gvYXJtNjQva2VybmVs L21hY2hpbmVfa2V4ZWNfZmlsZS5jIHwgMTIgKysrKysrLS0KPj4gwqAgYXJjaC9hcm02NC9rZXJu ZWwvc2V0dXAuY8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHwgMTMgKysrKysrKy0KPj4gwqAg YXJjaC9hcm02NC9tbS9pbml0LmPCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg fCA0MSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQo+PiDCoCA0IGZpbGVzIGNoYW5nZWQsIDQy IGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvYXJjaC9h cm02NC9rZXJuZWwvbWFjaGluZV9rZXhlYy5jIGIvYXJjaC9hcm02NC9rZXJuZWwvbWFjaGluZV9r ZXhlYy5jCj4+IGluZGV4IDZmYjMxYzExN2ViZTA4Yy4uNjY2NWJmMzFmNmI2YTE5IDEwMDY0NAo+ PiAtLS0gYS9hcmNoL2FybTY0L2tlcm5lbC9tYWNoaW5lX2tleGVjLmMKPj4gKysrIGIvYXJjaC9h cm02NC9rZXJuZWwvbWFjaGluZV9rZXhlYy5jCj4+IEBAIC0zMjcsNyArMzI3LDEwIEBAIGJvb2wg Y3Jhc2hfaXNfbm9zYXZlKHVuc2lnbmVkIGxvbmcgcGZuKQo+PiDCoCDCoMKgwqDCoMKgIC8qIGlu IHJlc2VydmVkIG1lbW9yeT8gKi8KPj4gwqDCoMKgwqDCoCBhZGRyID0gX19wZm5fdG9fcGh5cyhw Zm4pOwo+PiAtwqDCoMKgIGlmICgoYWRkciA8IGNyYXNoa19yZXMuc3RhcnQpIHx8IChjcmFzaGtf cmVzLmVuZCA8IGFkZHIpKQo+PiArwqDCoMKgIGlmICgoKGFkZHIgPCBjcmFzaGtfcmVzLnN0YXJ0 KSB8fCAoY3Jhc2hrX3Jlcy5lbmQgPCBhZGRyKSkgJiYgIWNyYXNoa19sb3dfcmVzLmVuZCkKPj4g K8KgwqDCoMKgwqDCoMKgIHJldHVybiBmYWxzZTsKPj4gKwo+PiArwqDCoMKgIGlmICgoYWRkciA8 IGNyYXNoa19sb3dfcmVzLnN0YXJ0KSB8fCAoY3Jhc2hrX2xvd19yZXMuZW5kIDwgYWRkcikpCj4+ IMKgwqDCoMKgwqDCoMKgwqDCoCByZXR1cm4gZmFsc2U7Cj4+IMKgIMKgwqDCoMKgwqAgaWYgKCFr ZXhlY19jcmFzaF9pbWFnZSkKPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva2VybmVsL21hY2hp bmVfa2V4ZWNfZmlsZS5jIGIvYXJjaC9hcm02NC9rZXJuZWwvbWFjaGluZV9rZXhlY19maWxlLmMK Pj4gaW5kZXggNTljNjQ4ZDUxODQ4ODg2Li44ODk5NTEyOTFjYzBmOWMgMTAwNjQ0Cj4+IC0tLSBh L2FyY2gvYXJtNjQva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jCj4+ICsrKyBiL2FyY2gvYXJt NjQva2VybmVsL21hY2hpbmVfa2V4ZWNfZmlsZS5jCj4+IEBAIC02NSwxMCArNjUsMTggQEAgc3Rh dGljIGludCBwcmVwYXJlX2VsZl9oZWFkZXJzKHZvaWQgKiphZGRyLCB1bnNpZ25lZCBsb25nICpz eikKPj4gwqAgwqDCoMKgwqDCoCAvKiBFeGNsdWRlIGNyYXNoa2VybmVsIHJlZ2lvbiAqLwo+PiDC oMKgwqDCoMKgIHJldCA9IGNyYXNoX2V4Y2x1ZGVfbWVtX3JhbmdlKGNtZW0sIGNyYXNoa19yZXMu c3RhcnQsIGNyYXNoa19yZXMuZW5kKTsKPj4gK8KgwqDCoCBpZiAocmV0KQo+PiArwqDCoMKgwqDC oMKgwqAgZ290byBvdXQ7Cj4+ICsKPj4gK8KgwqDCoCBpZiAoY3Jhc2hrX2xvd19yZXMuZW5kKSB7 Cj4+ICvCoMKgwqDCoMKgwqDCoCByZXQgPSBjcmFzaF9leGNsdWRlX21lbV9yYW5nZShjbWVtLCBj cmFzaGtfbG93X3Jlcy5zdGFydCwgY3Jhc2hrX2xvd19yZXMuZW5kKTsKPj4gK8KgwqDCoMKgwqDC oMKgIGlmIChyZXQpCj4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGdvdG8gb3V0Owo+PiArwqDC oMKgIH0KPj4gwqAgLcKgwqDCoCBpZiAoIXJldCkKPj4gLcKgwqDCoMKgwqDCoMKgIHJldCA9wqAg Y3Jhc2hfcHJlcGFyZV9lbGY2NF9oZWFkZXJzKGNtZW0sIHRydWUsIGFkZHIsIHN6KTsKPj4gK8Kg wqDCoCByZXQgPSBjcmFzaF9wcmVwYXJlX2VsZjY0X2hlYWRlcnMoY21lbSwgdHJ1ZSwgYWRkciwg c3opOwo+PiDCoCArb3V0Ogo+PiDCoMKgwqDCoMKgIGtmcmVlKGNtZW0pOwo+PiDCoMKgwqDCoMKg IHJldHVybiByZXQ7Cj4+IMKgIH0KPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva2VybmVsL3Nl dHVwLmMgYi9hcmNoL2FybTY0L2tlcm5lbC9zZXR1cC5jCj4+IGluZGV4IGJlNWY4NWIwYTI0ZGU2 OS4uNGJiMmU1NTM2NmJlNjRkIDEwMDY0NAo+PiAtLS0gYS9hcmNoL2FybTY0L2tlcm5lbC9zZXR1 cC5jCj4+ICsrKyBiL2FyY2gvYXJtNjQva2VybmVsL3NldHVwLmMKPj4gQEAgLTI0OCw3ICsyNDgs MTggQEAgc3RhdGljIHZvaWQgX19pbml0IHJlcXVlc3Rfc3RhbmRhcmRfcmVzb3VyY2VzKHZvaWQp Cj4+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGtlcm5lbF9kYXRhLmVuZCA8PSByZXMtPmVu ZCkKPj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgcmVxdWVzdF9yZXNvdXJjZShyZXMsICZr ZXJuZWxfZGF0YSk7Cj4+IMKgICNpZmRlZiBDT05GSUdfS0VYRUNfQ09SRQo+PiAtwqDCoMKgwqDC oMKgwqAgLyogVXNlcnNwYWNlIHdpbGwgZmluZCAiQ3Jhc2gga2VybmVsIiByZWdpb24gaW4gL3By b2MvaW9tZW0uICovCj4+ICvCoMKgwqDCoMKgwqDCoCAvKgo+PiArwqDCoMKgwqDCoMKgwqDCoCAq IFVzZXJzcGFjZSB3aWxsIGZpbmQgIkNyYXNoIGtlcm5lbCIgb3IgIkNyYXNoIGtlcm5lbCAobG93 KSIKPj4gK8KgwqDCoMKgwqDCoMKgwqAgKiByZWdpb24gaW4gL3Byb2MvaW9tZW0uCj4+ICvCoMKg wqDCoMKgwqDCoMKgICogSW4gb3JkZXIgdG8gZGlzdGluY3QgZnJvbSB0aGUgaGlnaCByZWdpb24g YW5kIG1ha2Ugbm8gZWZmZWN0Cj4+ICvCoMKgwqDCoMKgwqDCoMKgICogdG8gdGhlIHVzZSBvZiBl eGlzdGluZyBrZXhlYy10b29scywgcmVuYW1lIHRoZSBsb3cgcmVnaW9uIGFzCj4+ICvCoMKgwqDC oMKgwqDCoMKgICogIkNyYXNoIGtlcm5lbCAobG93KSIuCj4+ICvCoMKgwqDCoMKgwqDCoMKgICov Cj4+ICvCoMKgwqDCoMKgwqDCoCBpZiAoY3Jhc2hrX2xvd19yZXMuZW5kICYmIGNyYXNoa19sb3df cmVzLnN0YXJ0ID49IHJlcy0+c3RhcnQgJiYKPj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCBjcmFzaGtfbG93X3Jlcy5lbmQgPD0gcmVzLT5lbmQpIHsKPj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqAgY3Jhc2hrX2xvd19yZXMubmFtZSA9ICJDcmFzaCBrZXJuZWwgKGxvdykiOwo+PiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXF1ZXN0X3Jlc291cmNlKHJlcywgJmNyYXNoa19sb3df cmVzKTsKPj4gK8KgwqDCoMKgwqDCoMKgIH0KPj4gwqDCoMKgwqDCoMKgwqDCoMKgIGlmIChjcmFz aGtfcmVzLmVuZCAmJiBjcmFzaGtfcmVzLnN0YXJ0ID49IHJlcy0+c3RhcnQgJiYKPj4gwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgY3Jhc2hrX3Jlcy5lbmQgPD0gcmVzLT5lbmQpCj4+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIHJlcXVlc3RfcmVzb3VyY2UocmVzLCAmY3Jhc2hrX3Jlcyk7 Cj4+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L21tL2luaXQuYyBiL2FyY2gvYXJtNjQvbW0vaW5p dC5jCj4+IGluZGV4IGJlNDU5NWRjNzQ1OTExNS4uOTFiODAzOGExNTI5MDY4IDEwMDY0NAo+PiAt LS0gYS9hcmNoL2FybTY0L21tL2luaXQuYwo+PiArKysgYi9hcmNoL2FybTY0L21tL2luaXQuYwo+ PiBAQCAtNzQsNDEgKzc0LDMyIEBAIHBoeXNfYWRkcl90IGFybTY0X2RtYV9waHlzX2xpbWl0IF9f cm9fYWZ0ZXJfaW5pdDsKPj4gwqDCoCAqLwo+PiDCoCBzdGF0aWMgdm9pZCBfX2luaXQgcmVzZXJ2 ZV9jcmFzaGtlcm5lbCh2b2lkKQo+PiDCoCB7Cj4+IC3CoMKgwqAgdW5zaWduZWQgbG9uZyBsb25n IGNyYXNoX2Jhc2UsIGNyYXNoX3NpemU7Cj4+IC3CoMKgwqAgdW5zaWduZWQgbG9uZyBsb25nIGNy YXNoX21heCA9IENSQVNIX0FERFJfTE9XX01BWDsKPj4gK8KgwqDCoCB1bnNpZ25lZCBsb25nIGxv bmcgY3Jhc2hfc2l6ZSwgY3Jhc2hfYmFzZSwgdG90YWxfbWVtLCBsb3dfc2l6ZTsKPiAKPiBsb3df c2l6ZSBuZWVkcyB0byBiZSBpbml0aWFsaXplZCB0byAtMS4KPiAKPiBJZiBwYXJzZV9jcmFzaGtl cm5lbCgpIHN1Y2NlZWRzLCB0aGVuIGFuIHVuaW5pdGlhbGl6ZWQgbG93X3NpemUgd2lsbCBiZSBw YXNzZWQgdG8gcmVzZXJ2ZV9jcmFzaGtlcm5lbF9tZW0oKS4KClJpZ2h0LCB0aGFua3MsIEkgbm90 aWNlZCB0aGF0IHRvby4gSSdtIHdhaXRpbmcgZm9yIHY1LjE3LXJjMSB0byByZWxlYXNlIHYyMC4K CkluIGFkZGl0aW9uLCBJIGZvdW5kIHRoYXQgdGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gb24g eDg2IHdhcyBwcm9ibGVtYXRpYyBpbiBjYXNlCiJjcmFzaGtlcm5lbD00RyBjcmFzaGtlcm5lbD01 MTJNLGxvdyIuIEFjY29yZGluZyB0byB0aGUgZG9jdW1lbnQsICJjcmFzaGtlcm5lbD01MTJNLGxv dyIKc2hvdWxkIG5vdCB0YWtlIGVmZmVjdCBhdCB0aGlzIGNhc2UuIEJ1dCByZXNlcnZlX2NyYXNo a2VybmVsX2xvdygpIGRpZG4ndCBkbyB0aGF0IHdlbGwuCgo+IAo+PiArwqDCoMKgIGJvb2wgaGln aCA9IGZhbHNlOwo+PiDCoMKgwqDCoMKgIGludCByZXQ7Cj4+IMKgIC3CoMKgwqAgcmV0ID0gcGFy c2VfY3Jhc2hrZXJuZWwoYm9vdF9jb21tYW5kX2xpbmUsIG1lbWJsb2NrX3BoeXNfbWVtX3NpemUo KSwKPj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAmY3Jhc2hfc2l6ZSwgJmNyYXNo X2Jhc2UpOwo+PiAtwqDCoMKgIC8qIG5vIGNyYXNoa2VybmVsPSBvciBpbnZhbGlkIHZhbHVlIHNw ZWNpZmllZCAqLwo+PiAtwqDCoMKgIGlmIChyZXQgfHwgIWNyYXNoX3NpemUpCj4+IC3CoMKgwqDC oMKgwqDCoCByZXR1cm47Cj4+IC0KPj4gLcKgwqDCoCBjcmFzaF9zaXplID0gUEFHRV9BTElHTihj cmFzaF9zaXplKTsKPj4gLQo+PiAtwqDCoMKgIC8qIFVzZXIgc3BlY2lmaWVzIGJhc2UgYWRkcmVz cyBleHBsaWNpdGx5LiAqLwo+PiAtwqDCoMKgIGlmIChjcmFzaF9iYXNlKQo+PiAtwqDCoMKgwqDC oMKgwqAgY3Jhc2hfbWF4ID0gY3Jhc2hfYmFzZSArIGNyYXNoX3NpemU7Cj4+ICvCoMKgwqAgdG90 YWxfbWVtID0gbWVtYmxvY2tfcGh5c19tZW1fc2l6ZSgpOwo+PiDCoCAtwqDCoMKgIC8qIEN1cnJl bnQgYXJtNjQgYm9vdCBwcm90b2NvbCByZXF1aXJlcyAyTUIgYWxpZ25tZW50ICovCj4+IC3CoMKg wqAgY3Jhc2hfYmFzZSA9IG1lbWJsb2NrX3BoeXNfYWxsb2NfcmFuZ2UoY3Jhc2hfc2l6ZSwgQ1JB U0hfQUxJR04sCj4+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIGNyYXNoX2Jhc2UsIGNyYXNoX21heCk7Cj4+IC3CoMKgwqAgaWYgKCFjcmFzaF9i YXNlKSB7Cj4+IC3CoMKgwqDCoMKgwqDCoCBwcl93YXJuKCJjYW5ub3QgYWxsb2NhdGUgY3Jhc2hr ZXJuZWwgKHNpemU6MHglbGx4KVxuIiwKPj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgY3Jhc2hf c2l6ZSk7Cj4+IC3CoMKgwqDCoMKgwqDCoCByZXR1cm47Cj4+ICvCoMKgwqAgcmV0ID0gcGFyc2Vf Y3Jhc2hrZXJuZWwoYm9vdF9jb21tYW5kX2xpbmUsIHRvdGFsX21lbSwgJmNyYXNoX3NpemUsICZj cmFzaF9iYXNlKTsKPj4gK8KgwqDCoCBpZiAocmV0ICE9IDAgfHwgY3Jhc2hfc2l6ZSA8PSAwKSB7 Cj4+ICvCoMKgwqDCoMKgwqDCoCAvKiBjcmFzaGtlcm5lbD1YLGhpZ2ggYW5kIHBvc3NpYmxlIGNy YXNoa2VybmVsPVksbG93ICovCj4+ICvCoMKgwqDCoMKgwqDCoCByZXQgPSBwYXJzZV9jcmFzaGtl cm5lbF9oaWdoX2xvdyhib290X2NvbW1hbmRfbGluZSwgJmNyYXNoX3NpemUsICZsb3dfc2l6ZSk7 Cj4+ICvCoMKgwqDCoMKgwqDCoCBpZiAocmV0KQo+PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBy ZXR1cm47Cj4+ICvCoMKgwqDCoMKgwqDCoCBoaWdoID0gdHJ1ZTsKPj4gwqDCoMKgwqDCoCB9Cj4+ IMKgIC3CoMKgwqAgcHJfaW5mbygiY3Jhc2hrZXJuZWwgcmVzZXJ2ZWQ6IDB4JTAxNmxseCAtIDB4 JTAxNmxseCAoJWxsZCBNQilcbiIsCj4+IC3CoMKgwqDCoMKgwqDCoCBjcmFzaF9iYXNlLCBjcmFz aF9iYXNlICsgY3Jhc2hfc2l6ZSwgY3Jhc2hfc2l6ZSA+PiAyMCk7Cj4+ICvCoMKgwqAgcmV0ID0g cmVzZXJ2ZV9jcmFzaGtlcm5lbF9tZW0odG90YWxfbWVtLCBjcmFzaF9zaXplLCBjcmFzaF9iYXNl LCBsb3dfc2l6ZSwgaGlnaCk7Cj4+ICvCoMKgwqAgaWYgKHJldCkKPj4gK8KgwqDCoMKgwqDCoMKg IHJldHVybjsKPj4gwqAgwqDCoMKgwqDCoCAvKgo+PiDCoMKgwqDCoMKgwqAgKiBUaGUgY3Jhc2hr ZXJuZWwgbWVtb3J5IHdpbGwgYmUgcmVtb3ZlZCBmcm9tIHRoZSBrZXJuZWwgbGluZWFyCj4+IMKg wqDCoMKgwqDCoCAqIG1hcC4gSW5mb3JtIGttZW1sZWFrIHNvIHRoYXQgaXQgd29uJ3QgdHJ5IHRv IGFjY2VzcyBpdC4KPj4gwqDCoMKgwqDCoMKgICovCj4+IC3CoMKgwqAga21lbWxlYWtfaWdub3Jl X3BoeXMoY3Jhc2hfYmFzZSk7Cj4+IC3CoMKgwqAgY3Jhc2hrX3Jlcy5zdGFydCA9IGNyYXNoX2Jh c2U7Cj4+IC3CoMKgwqAgY3Jhc2hrX3Jlcy5lbmQgPSBjcmFzaF9iYXNlICsgY3Jhc2hfc2l6ZSAt IDE7Cj4+ICvCoMKgwqAga21lbWxlYWtfaWdub3JlX3BoeXMoY3Jhc2hrX3Jlcy5zdGFydCk7Cj4+ ICvCoMKgwqAgaWYgKGNyYXNoa19sb3dfcmVzLmVuZCkKPj4gK8KgwqDCoMKgwqDCoMKgIGttZW1s ZWFrX2lnbm9yZV9waHlzKGNyYXNoa19sb3dfcmVzLnN0YXJ0KTsKPj4gwqAgfQo+PiDCoCAjZWxz ZQo+PiDCoCBzdGF0aWMgdm9pZCBfX2luaXQgcmVzZXJ2ZV9jcmFzaGtlcm5lbCh2b2lkKQo+IAo+ IC4KPiAKCi0tIApSZWdhcmRzLAogIFpoZW4gTGVpCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51 eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leizhen (ThunderTown) Date: Thu, 13 Jan 2022 09:17:38 +0800 Subject: [PATCH v19 11/13] arm64: kdump: reimplement crashkernel=X In-Reply-To: References: <20211228132612.1860-1-thunder.leizhen@huawei.com> <20211228132612.1860-12-thunder.leizhen@huawei.com> Message-ID: <6bcea8a4-c244-bb0c-ff55-92cbe463b4cc@huawei.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kexec@lists.infradead.org On 2022/1/12 22:45, Dave Kleikamp wrote: > On 12/28/21 7:26AM, Zhen Lei wrote: >> From: Chen Zhou >> >> 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. >> >> To solve these issues, change the behavior of crashkernel=X and >> introduce crashkernel=X,[high,low]. crashkernel=X tries low allocation >> in DMA zone, and fall back to high allocation if it fails. >> We can also use "crashkernel=X,high" to select a region above DMA zone, >> which also tries to allocate at least 256M in DMA zone automatically. >> "crashkernel=Y,low" can be used to allocate specified size low memory. >> >> Another minor change, 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)". >> >> Signed-off-by: Chen Zhou >> Co-developed-by: Zhen Lei >> Signed-off-by: Zhen Lei >> --- >> ? arch/arm64/kernel/machine_kexec.c????? |? 5 +++- >> ? arch/arm64/kernel/machine_kexec_file.c | 12 ++++++-- >> ? arch/arm64/kernel/setup.c????????????? | 13 +++++++- >> ? arch/arm64/mm/init.c?????????????????? | 41 ++++++++++---------------- >> ? 4 files changed, 42 insertions(+), 29 deletions(-) >> >> diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c >> index 6fb31c117ebe08c..6665bf31f6b6a19 100644 >> --- a/arch/arm64/kernel/machine_kexec.c >> +++ b/arch/arm64/kernel/machine_kexec.c >> @@ -327,7 +327,10 @@ bool crash_is_nosave(unsigned long pfn) >> ? ????? /* in reserved memory? */ >> ????? addr = __pfn_to_phys(pfn); >> -??? if ((addr < crashk_res.start) || (crashk_res.end < addr)) >> +??? if (((addr < crashk_res.start) || (crashk_res.end < addr)) && !crashk_low_res.end) >> +??????? return false; >> + >> +??? if ((addr < crashk_low_res.start) || (crashk_low_res.end < addr)) >> ????????? return false; >> ? ????? if (!kexec_crash_image) >> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c >> index 59c648d51848886..889951291cc0f9c 100644 >> --- a/arch/arm64/kernel/machine_kexec_file.c >> +++ b/arch/arm64/kernel/machine_kexec_file.c >> @@ -65,10 +65,18 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) >> ? ????? /* Exclude crashkernel region */ >> ????? ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); >> +??? if (ret) >> +??????? goto out; >> + >> +??? if (crashk_low_res.end) { >> +??????? ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); >> +??????? if (ret) >> +??????????? goto out; >> +??? } >> ? -??? if (!ret) >> -??????? ret =? crash_prepare_elf64_headers(cmem, true, addr, sz); >> +??? ret = crash_prepare_elf64_headers(cmem, true, addr, sz); >> ? +out: >> ????? kfree(cmem); >> ????? return ret; >> ? } >> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c >> index be5f85b0a24de69..4bb2e55366be64d 100644 >> --- a/arch/arm64/kernel/setup.c >> +++ b/arch/arm64/kernel/setup.c >> @@ -248,7 +248,18 @@ static void __init request_standard_resources(void) >> ????????????? kernel_data.end <= res->end) >> ????????????? request_resource(res, &kernel_data); >> ? #ifdef CONFIG_KEXEC_CORE >> -??????? /* Userspace will find "Crash kernel" region in /proc/iomem. */ >> +??????? /* >> +???????? * Userspace will find "Crash kernel" or "Crash kernel (low)" >> +???????? * region in /proc/iomem. >> +???????? * 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)". >> +???????? */ >> +??????? if (crashk_low_res.end && crashk_low_res.start >= res->start && >> +??????????????? crashk_low_res.end <= res->end) { >> +??????????? crashk_low_res.name = "Crash kernel (low)"; >> +??????????? request_resource(res, &crashk_low_res); >> +??????? } >> ????????? if (crashk_res.end && crashk_res.start >= res->start && >> ????????????? crashk_res.end <= res->end) >> ????????????? request_resource(res, &crashk_res); >> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c >> index be4595dc7459115..91b8038a1529068 100644 >> --- a/arch/arm64/mm/init.c >> +++ b/arch/arm64/mm/init.c >> @@ -74,41 +74,32 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init; >> ?? */ >> ? static void __init reserve_crashkernel(void) >> ? { >> -??? unsigned long long crash_base, crash_size; >> -??? unsigned long long crash_max = CRASH_ADDR_LOW_MAX; >> +??? unsigned long long crash_size, crash_base, total_mem, low_size; > > low_size needs to be initialized to -1. > > If parse_crashkernel() succeeds, then an uninitialized low_size will be passed to reserve_crashkernel_mem(). Right, thanks, I noticed that too. I'm waiting for v5.17-rc1 to release v20. In addition, I found that the current implementation on x86 was problematic in case "crashkernel=4G crashkernel=512M,low". According to the document, "crashkernel=512M,low" should not take effect at this case. But reserve_crashkernel_low() didn't do that well. > >> +??? bool high = false; >> ????? int ret; >> ? -??? ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), >> -??????????????? &crash_size, &crash_base); >> -??? /* no crashkernel= or invalid value specified */ >> -??? if (ret || !crash_size) >> -??????? return; >> - >> -??? crash_size = PAGE_ALIGN(crash_size); >> - >> -??? /* User specifies base address explicitly. */ >> -??? if (crash_base) >> -??????? crash_max = crash_base + crash_size; >> +??? total_mem = memblock_phys_mem_size(); >> ? -??? /* Current arm64 boot protocol requires 2MB alignment */ >> -??? crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN, >> -?????????????????????????? crash_base, crash_max); >> -??? if (!crash_base) { >> -??????? pr_warn("cannot allocate crashkernel (size:0x%llx)\n", >> -??????????? crash_size); >> -??????? return; >> +??? ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base); >> +??? if (ret != 0 || crash_size <= 0) { >> +??????? /* crashkernel=X,high and possible crashkernel=Y,low */ >> +??????? ret = parse_crashkernel_high_low(boot_command_line, &crash_size, &low_size); >> +??????? if (ret) >> +??????????? return; >> +??????? high = true; >> ????? } >> ? -??? pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n", >> -??????? crash_base, crash_base + crash_size, crash_size >> 20); >> +??? ret = reserve_crashkernel_mem(total_mem, crash_size, crash_base, low_size, high); >> +??? if (ret) >> +??????? return; >> ? ????? /* >> ?????? * The crashkernel memory will be removed from the kernel linear >> ?????? * map. Inform kmemleak so that it won't try to access it. >> ?????? */ >> -??? kmemleak_ignore_phys(crash_base); >> -??? crashk_res.start = crash_base; >> -??? crashk_res.end = crash_base + crash_size - 1; >> +??? kmemleak_ignore_phys(crashk_res.start); >> +??? if (crashk_low_res.end) >> +??????? kmemleak_ignore_phys(crashk_low_res.start); >> ? } >> ? #else >> ? static void __init reserve_crashkernel(void) > > . > -- Regards, Zhen Lei