Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2658299yba; Mon, 8 Apr 2019 01:41:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAyMnweSm/qkXEF/3WH7RZjx1uRU4S0JyhxfS07qXK7lsUnFDI8Z0pzUWP3L5ylf2lkGsw X-Received: by 2002:a17:902:d24:: with SMTP id 33mr29621272plu.246.1554712866741; Mon, 08 Apr 2019 01:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554712866; cv=none; d=google.com; s=arc-20160816; b=byaB/0UqGY8AEfg06NBcVf1zKI/X5O801GSaG/qARLsRa45DKyeI3feZs0R/GkRDdN 4KSRmFbybJBsgZVGX+brJQOm0fL8tU/l+8asYnpSTDWVDYjt67LgCh4wR+OEeSoXA48o aFBu+1SYo1JYtGkaUIaEnYalFe2XMYUzOGvtS8u521ofgqz29TjaevCx38KwJEwqipZx l0W+phAuDjtOh6/teLbvXGzAWflYAP07WnzyIb1QErTNQHI+rYaS0KXNFsmhX3AnxX6U sAO4/7XsVMUlU+wBcXwmKzcaR8YXW6kR5Mcp3dwBy+fnvNxa9HFN9n9JNChA/Fb+HliL f2vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:cc:references:to :subject; bh=ZTnRJnt/9uvzdBNuKhtB5sQ24kvrcK1ktT8uppRyaM8=; b=AzX1t2wNox63UX9P8gLI+zt4WKlja/mzM2LVjiDAQoRFspcsFuM4vvQrJ0eyQWbk0P TNvyJzl/wcs487QWwPBYWHHbVkuYqksvBC84U3F3fb6g65T8mwYsguewlHi9eKWzdAKx z+p9zL884pU7osbw3vPWImM5cFjHGlfitfNn48HZtln3HzndZF54KqI8OOm63Sfy6qVq l03NOX0EnHmscu0PDAGVZXAF+oripaWxL18lRjG8yBfsfnkq7M3oQWtQEUAxGpQFAU4U wBgC50iq57Zgh+qtGjluU9HmKlsblHHOvkwptv7XYQWeRDOs1IlZyJbD0B9cYVtKzh5Q sxeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9si22232983pls.12.2019.04.08.01.40.51; Mon, 08 Apr 2019 01:41:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726513AbfDHIkO (ORCPT + 99 others); Mon, 8 Apr 2019 04:40:14 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:40936 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726189AbfDHIkN (ORCPT ); Mon, 8 Apr 2019 04:40:13 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D3C144B3660DE31C2D9C; Mon, 8 Apr 2019 16:40:10 +0800 (CST) Received: from [127.0.0.1] (10.177.131.64) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.408.0; Mon, 8 Apr 2019 16:40:02 +0800 Subject: Re: [PATCH 2/3] arm64: kdump: support more than one crash kernel regions To: Mike Rapoport References: <20190403030546.23718-1-chenzhou10@huawei.com> <20190403030546.23718-3-chenzhou10@huawei.com> <20190403112929.GA7715@rapoport-lnx> <20190404144408.GA6433@rapoport-lnx> <783b8712-ddb1-a52b-81ee-0c6a216e5b7d@huawei.com> <4b188535-c12d-e05b-9154-2c2d580f903b@huawei.com> <20190408065711.GA8403@rapoport-lnx> CC: , , , , , , , , , From: Chen Zhou Message-ID: <3fc772a2-292b-9c2a-465f-eabe86961dfd@huawei.com> Date: Mon, 8 Apr 2019 16:39:59 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20190408065711.GA8403@rapoport-lnx> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.131.64] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mike, On 2019/4/8 14:57, Mike Rapoport wrote: > Hi, > > On Fri, Apr 05, 2019 at 11:47:27AM +0800, Chen Zhou wrote: >> Hi Mike, >> >> On 2019/4/5 10:17, Chen Zhou wrote: >>> Hi Mike, >>> >>> On 2019/4/4 22:44, Mike Rapoport wrote: >>>> Hi, >>>> >>>> On Wed, Apr 03, 2019 at 09:51:27PM +0800, Chen Zhou wrote: >>>>> Hi Mike, >>>>> >>>>> On 2019/4/3 19:29, Mike Rapoport wrote: >>>>>> On Wed, Apr 03, 2019 at 11:05:45AM +0800, Chen Zhou wrote: >>>>>>> After commit (arm64: kdump: support reserving crashkernel above 4G), >>>>>>> there may be two crash kernel regions, one is below 4G, the other is >>>>>>> above 4G. >>>>>>> >>>>>>> Crash dump kernel reads more than one crash kernel regions via a dtb >>>>>>> property under node /chosen, >>>>>>> linux,usable-memory-range = >>>>>>> >>>>>>> Signed-off-by: Chen Zhou >>>>>>> --- >>>>>>> arch/arm64/mm/init.c | 37 +++++++++++++++++++++++++------------ >>>>>>> include/linux/memblock.h | 1 + >>>>>>> mm/memblock.c | 40 ++++++++++++++++++++++++++++++++++++++++ >>>>>>> 3 files changed, 66 insertions(+), 12 deletions(-) >>>>>>> >>>>>>> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c >>>>>>> index ceb2a25..769c77a 100644 >>>>>>> --- a/arch/arm64/mm/init.c >>>>>>> +++ b/arch/arm64/mm/init.c >>>>>>> @@ -64,6 +64,8 @@ EXPORT_SYMBOL(memstart_addr); >>>>>>> phys_addr_t arm64_dma_phys_limit __ro_after_init; >>>>>>> >>>>>>> #ifdef CONFIG_KEXEC_CORE >>>>>>> +# define CRASH_MAX_USABLE_RANGES 2 >>>>>>> + >>>>>>> static int __init reserve_crashkernel_low(void) >>>>>>> { >>>>>>> unsigned long long base, low_base = 0, low_size = 0; >>>>>>> @@ -346,8 +348,8 @@ static int __init early_init_dt_scan_usablemem(unsigned long node, >>>>>>> const char *uname, int depth, void *data) >>>>>>> { >>>>>>> struct memblock_region *usablemem = data; >>>>>>> - const __be32 *reg; >>>>>>> - int len; >>>>>>> + const __be32 *reg, *endp; >>>>>>> + int len, nr = 0; >>>>>>> >>>>>>> if (depth != 1 || strcmp(uname, "chosen") != 0) >>>>>>> return 0; >>>>>>> @@ -356,22 +358,33 @@ static int __init early_init_dt_scan_usablemem(unsigned long node, >>>>>>> if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells))) >>>>>>> return 1; >>>>>>> >>>>>>> - usablemem->base = dt_mem_next_cell(dt_root_addr_cells, ®); >>>>>>> - usablemem->size = dt_mem_next_cell(dt_root_size_cells, ®); >>>>>>> + endp = reg + (len / sizeof(__be32)); >>>>>>> + while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) { >>>>>>> + usablemem[nr].base = dt_mem_next_cell(dt_root_addr_cells, ®); >>>>>>> + usablemem[nr].size = dt_mem_next_cell(dt_root_size_cells, ®); >>>>>>> + >>>>>>> + if (++nr >= CRASH_MAX_USABLE_RANGES) >>>>>>> + break; >>>>>>> + } >>>>>>> >>>>>>> return 1; >>>>>>> } >>>>>>> >>>>>>> static void __init fdt_enforce_memory_region(void) >>>>>>> { >>>>>>> - struct memblock_region reg = { >>>>>>> - .size = 0, >>>>>>> - }; >>>>>>> - >>>>>>> - of_scan_flat_dt(early_init_dt_scan_usablemem, ®); >>>>>>> - >>>>>>> - if (reg.size) >>>>>>> - memblock_cap_memory_range(reg.base, reg.size); >>>>>>> + int i, cnt = 0; >>>>>>> + struct memblock_region regs[CRASH_MAX_USABLE_RANGES]; >>>>>>> + >>>>>>> + memset(regs, 0, sizeof(regs)); >>>>>>> + of_scan_flat_dt(early_init_dt_scan_usablemem, regs); >>>>>>> + >>>>>>> + for (i = 0; i < CRASH_MAX_USABLE_RANGES; i++) >>>>>>> + if (regs[i].size) >>>>>>> + cnt++; >>>>>>> + else >>>>>>> + break; >>>>>>> + if (cnt) >>>>>>> + memblock_cap_memory_ranges(regs, cnt); >>>>>> >>>>>> Why not simply call memblock_cap_memory_range() for each region? >>>>> >>>>> Function memblock_cap_memory_range() removes all memory type ranges except specified range. >>>>> So if we call memblock_cap_memory_range() for each region simply, there will be no usable-memory >>>>> on kdump capture kernel. >>>> >>>> Thanks for the clarification. >>>> I still think that memblock_cap_memory_ranges() is overly complex. >>>> >>>> How about doing something like this: >>>> >>>> Cap the memory range for [min(regs[*].start, max(regs[*].end)] and then >>>> removing the range in the middle? >>> >>> Yes, that would be ok. But that would do one more memblock_cap_memory_range operation. >>> That is, if there are n regions, we need to do (n + 1) operations, which doesn't seem to >>> matter. >>> >>> I agree with you, your idea is better. >>> >>> Thanks, >>> Chen Zhou >> >> Sorry, just ignore my previous reply, I got that wrong. >> >> I think it carefully, we can cap the memory range for [min(regs[*].start, max(regs[*].end)] >> firstly. But how to remove the middle ranges, we still can't use memblock_cap_memory_range() >> directly and the extra remove operation may be complex. >> >> For more than one regions, i think add a new memblock_cap_memory_ranges() may be better. >> Besides, memblock_cap_memory_ranges() is also applicable for one region. >> >> How about replace memblock_cap_memory_range() with memblock_cap_memory_ranges()? > > arm64 is the only user of both MEMBLOCK_NOMAP and memblock_cap_memory_range() > and I don't expect other architectures will use these interfaces. > It seems that capping the memory for arm64 crash kernel the way I've > suggested can be implemented in fdt_enforce_memory_region(). If we'd ever > need such functionality elsewhere or CRASH_MAX_USABLE_RANGES will need to > grow we'll rethink the solution. Ok, i will implement that in fdt_enforce_memory_region() in next version. And we will support at most two crash kernel regions now. Thanks, Chen Zhou > >> Thanks, >> Chen Zhou >