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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C640FC4360F for ; Wed, 3 Apr 2019 13:51:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 425352084B for ; Wed, 3 Apr 2019 13:51:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 425352084B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A8E156B0008; Wed, 3 Apr 2019 09:51:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A3E866B000A; Wed, 3 Apr 2019 09:51:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92D7E6B000C; Wed, 3 Apr 2019 09:51:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by kanga.kvack.org (Postfix) with ESMTP id 712EA6B0008 for ; Wed, 3 Apr 2019 09:51:45 -0400 (EDT) Received: by mail-vs1-f71.google.com with SMTP id a17so3046695vso.15 for ; Wed, 03 Apr 2019 06:51:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to :references:cc:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=hMqWuI/9b+ZRX77roP5GfpQ2LoTiBddiSi6eq65PLE8=; b=Fdtqtd/1q1+d6lDdoiVtpdWm9zWoVfdaD7dMYdt0hDRp8U+hyXTiEHZI0Ke990Vawx WDYFHX+Qei8uXhg2DAyBQW21ps/F1HWgMFI08tagH7kOl9IJXBGd2qW0QKO0s5WEQ4/V 2cyrmJ/uU+T1j1upK1TjYcfaw6M0XV2va06WLjWijEn5yBPas6M1/7Jt6AD/ntUKvxie O0UBJMCdntQuHVFjikiuDOcKAKNra2+iwuF4a+UPpF3xBM7GMXT1Opxi0SX74X/0AOAQ xWCCpEN1epJVwWtVb6YNCG3+h/9NGlqlN+z1r32m2uziTW3kjAkf/56tMC7varAwcx6v KDaA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAUX+EyVf+9AQoK1i0I3QVqw0EpoCTbWISPc75n0EVwymVPru4+K y2gq2MCRGbFUIQg+X9xFAto6sf8CFByOP/aT0XN2b68pgWmPPro2xj9hkJgEn9uydaYxfPobI50 qB++xf/ou4NxUHi3QGfZ9WnQAHqILKG9JTTygwGjKl6Eo33OsqZawjpA/Q4C5GJ0ONw== X-Received: by 2002:a1f:10a0:: with SMTP id 32mr191658vkq.12.1554299505047; Wed, 03 Apr 2019 06:51:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMMyli+EM4/3QCf7BlcaiJiV6nXTSH0/FgTLv9aa8dgEkMWOSDYBxNjQo0lyOwMTBnQl/5 X-Received: by 2002:a1f:10a0:: with SMTP id 32mr191619vkq.12.1554299504114; Wed, 03 Apr 2019 06:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554299504; cv=none; d=google.com; s=arc-20160816; b=iwe04zCXtTL0SxSiULywmd6JKiUqMWH81cx8pjlGMDautIB+RKD6Gxee6DTNhuXQNe YQJXewEkw1rpiDKINxkXXQeeauwQoVKYD6YRJAnh1FRo7pWu+uGkhVYRRF8uppNbmiO2 v4JPXsd2gy54Db1NoSPoDvmj4lRBhPmfimKk+gbIfJPGnm4I3RoszfwZYPLpEnOuUi69 AS9xCQktG6CK2MDzDvcnDJhO8v2frf63Q2FSNGJPm0pw4GklnYcKBHyuEm37bchrkys0 KFZln6pwEZDLgp20GlkUZE7OMw/Zunjy75J8Lx0F4H96yN/xMcS4UIa493vp1HSx16EL /txQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:cc:references:to:subject; bh=hMqWuI/9b+ZRX77roP5GfpQ2LoTiBddiSi6eq65PLE8=; b=SzzPNok1tKnF2L8BW1V/1FkO9vT3Jfc2WErCnxzSQ6w+FCnXTO8XkilNw8MRn8jyt4 5bupwR0d9zCQJJuqSqLc53wVaqTeze8dHZB+NjaDhcSXRRrld51mehw/Vs1Rvtbq/dK9 AlWW7JiLmWwiHjASQKvwz75ZnyPU3kE0BzklcIozMhyEjySWUZo9DkMhWrQqQZKDAdUb 2TyruiL99LaTaflL+mtGuVlPQWGvqi4NgUseI965MrY5wp1i7H74+J7P1D271lz2MBPF IBV0ByvOOUBOK+yS/U12FwSehzSwvWcLQ6jxKO4KogvCNPOBAzMiN3IWKeihLaMvsNPK lNYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga05-in.huawei.com. [45.249.212.191]) by mx.google.com with ESMTPS id m6si4943630uae.108.2019.04.03.06.51.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 06:51:44 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.191 as permitted sender) client-ip=45.249.212.191; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS407-HUB.china.huawei.com (unknown [10.3.19.207]) by Forcepoint Email with ESMTP id 7F3A75F44857EBFD6F91; Wed, 3 Apr 2019 21:51:38 +0800 (CST) Received: from [127.0.0.1] (10.177.131.64) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.408.0; Wed, 3 Apr 2019 21:51:29 +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> CC: , , , , , , , , , From: Chen Zhou Message-ID: Date: Wed, 3 Apr 2019 21:51:27 +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: <20190403112929.GA7715@rapoport-lnx> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.131.64] X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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, Chen Zhou > >> } >> >> void __init arm64_memblock_init(void) >> diff --git a/include/linux/memblock.h b/include/linux/memblock.h >> index 47e3c06..aeade34 100644 >> --- a/include/linux/memblock.h >> +++ b/include/linux/memblock.h >> @@ -446,6 +446,7 @@ phys_addr_t memblock_start_of_DRAM(void); >> phys_addr_t memblock_end_of_DRAM(void); >> void memblock_enforce_memory_limit(phys_addr_t memory_limit); >> void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size); >> +void memblock_cap_memory_ranges(struct memblock_region *regs, int cnt); >> void memblock_mem_limit_remove_map(phys_addr_t limit); >> bool memblock_is_memory(phys_addr_t addr); >> bool memblock_is_map_memory(phys_addr_t addr); >> diff --git a/mm/memblock.c b/mm/memblock.c >> index 28fa8926..1a7f4ee7c 100644 >> --- a/mm/memblock.c >> +++ b/mm/memblock.c >> @@ -1697,6 +1697,46 @@ void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size) >> base + size, PHYS_ADDR_MAX); >> } >> >> +void __init memblock_cap_memory_ranges(struct memblock_region *regs, int cnt) >> +{ >> + int start_rgn[INIT_MEMBLOCK_REGIONS], end_rgn[INIT_MEMBLOCK_REGIONS]; >> + int i, j, ret, nr = 0; >> + >> + for (i = 0; i < cnt; i++) { >> + ret = memblock_isolate_range(&memblock.memory, regs[i].base, >> + regs[i].size, &start_rgn[i], &end_rgn[i]); >> + if (ret) >> + break; >> + nr++; >> + } >> + if (!nr) >> + return; >> + >> + /* remove all the MAP regions */ >> + for (i = memblock.memory.cnt - 1; i >= end_rgn[nr - 1]; i--) >> + if (!memblock_is_nomap(&memblock.memory.regions[i])) >> + memblock_remove_region(&memblock.memory, i); >> + >> + for (i = nr - 1; i > 0; i--) >> + for (j = start_rgn[i] - 1; j >= end_rgn[i - 1]; j--) >> + if (!memblock_is_nomap(&memblock.memory.regions[j])) >> + memblock_remove_region(&memblock.memory, j); >> + >> + for (i = start_rgn[0] - 1; i >= 0; i--) >> + if (!memblock_is_nomap(&memblock.memory.regions[i])) >> + memblock_remove_region(&memblock.memory, i); >> + >> + /* truncate the reserved regions */ >> + memblock_remove_range(&memblock.reserved, 0, regs[0].base); >> + >> + for (i = nr - 1; i > 0; i--) >> + memblock_remove_range(&memblock.reserved, >> + regs[i].base, regs[i - 1].base + regs[i - 1].size); >> + >> + memblock_remove_range(&memblock.reserved, >> + regs[nr - 1].base + regs[nr - 1].size, PHYS_ADDR_MAX); >> +} >> + >> void __init memblock_mem_limit_remove_map(phys_addr_t limit) >> { >> phys_addr_t max_addr; >> -- >> 2.7.4 >> >