Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp6998233ybi; Wed, 5 Jun 2019 09:32:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxR/aIRLHtS8ZTezk9qJzm3VcfPrwesc1u499FtFVDcYOIPFWNx2bgi9YBSlq+JNK9de+mv X-Received: by 2002:a62:4d04:: with SMTP id a4mr47244585pfb.177.1559752354416; Wed, 05 Jun 2019 09:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559752354; cv=none; d=google.com; s=arc-20160816; b=L2naEPLIBy8bp7r+nscEq9XihWGX8KVlBUN8ftE5aDxYaGMS/HeAHTCZ7VtW4WIP2O YzPZYA5gbwwnfRGo7JXueGgD8PAPEkkNMx/oh9YSX1xUB5Bwfpn+9knOgCrqqgFDVWC5 vYmj8tSrZidb/E1gnJHGHE2UQ+ud7M4AIu7t3hOuZJnd/W7gOMlpEzlICEszgKUUusq3 wvFvmTo552Rft+cc5IZe4xHKEdaYjiFvQ+KbTfi5958iEgDUw5WPi8o09ADeYNnzBDgy OgRiM1dI72onlO4aZarR3Y7OKhYvEbjkywlrrlqbTraJdW4fMYiuR3o8ryvma9xeeEQY ImpQ== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=guh90kjB0XUjeDLm/cngyCHNYtBtUNJ42bt+oPjPHic=; b=yv66NglppdnB+boRk4kBUgWNzzW/S38TXKOuODa5Vpsgo+R+HjhjgLl+gmD835pDZk 7ZmGCTZmsvWkPjZJxEM+6SMEYawqUgleLVcyd/oLbYJzuAPUuzqGyxWZ/pAA5fnnKAjB p32B7e1gi3LW7JgGs0d2SvB93vdG+KVK8X4mTCmB+Iq4atlASihEVsolzw/oPPUCQRI2 NN6w3BdDZNTe+0IhazBAhKmNUOUJBLsc/1sQAelwlwdCVn+bSw8iJfmGkqDkleNSLKle msiwhQYnwRunCSCmBruy9pOfyJXfgQ/5b766hNIxbe/FepTT1J6lkvj41jHU2uSgf/8p +mFQ== 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 z7si25896848pgi.365.2019.06.05.09.32.15; Wed, 05 Jun 2019 09:32:34 -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 S1728690AbfFEQaA (ORCPT + 99 others); Wed, 5 Jun 2019 12:30:00 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:34562 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726421AbfFEQaA (ORCPT ); Wed, 5 Jun 2019 12:30:00 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 90C74374; Wed, 5 Jun 2019 09:29:59 -0700 (PDT) Received: from [10.1.196.105] (eglon.cambridge.arm.com [10.1.196.105]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A90FC3F5AF; Wed, 5 Jun 2019 09:29:56 -0700 (PDT) Subject: Re: [PATCH 2/4] arm64: kdump: support reserving crashkernel above 4G To: Chen Zhou Cc: catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org, ard.biesheuvel@linaro.org, rppt@linux.ibm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, ebiederm@xmission.com, horms@verge.net.au, takahiro.akashi@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, wangkefeng.wang@huawei.com References: <20190507035058.63992-1-chenzhou10@huawei.com> <20190507035058.63992-3-chenzhou10@huawei.com> From: James Morse Message-ID: Date: Wed, 5 Jun 2019 17:29:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190507035058.63992-3-chenzhou10@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On 07/05/2019 04:50, Chen Zhou wrote: > When crashkernel is reserved above 4G in memory, kernel should > reserve some amount of low memory for swiotlb and some DMA buffers. > Meanwhile, support crashkernel=X,[high,low] in arm64. When use > crashkernel=X parameter, try low memory first and fall back to high > memory unless "crashkernel=X,high" is specified. What is the 'unless crashkernel=...,high' for? I think it would be simpler to relax the ARCH_LOW_ADDRESS_LIMIT if reserve_crashkernel_low() allocated something. This way "crashkernel=1G" tries to allocate 1G below 4G, but fails if there isn't enough memory. "crashkernel=1G crashkernel=16M,low" allocates 16M below 4G, which is more likely to succeed, if it does it can then place the 1G block anywhere. > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 413d566..82cd9a0 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -243,6 +243,9 @@ static void __init request_standard_resources(void) > request_resource(res, &kernel_data); > #ifdef CONFIG_KEXEC_CORE > /* Userspace will find "Crash kernel" region in /proc/iomem. */ > + if (crashk_low_res.end && crashk_low_res.start >= res->start && > + crashk_low_res.end <= res->end) > + 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); With both crashk_low_res and crashk_res, we end up with two entries in /proc/iomem called "Crash kernel". Because its sorted by address, and kexec-tools stops searching when it find "Crash kernel", you are always going to get the kernel placed in the lower portion. I suspect this isn't what you want, can we rename crashk_low_res for arm64 so that existing kexec-tools doesn't use it? > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index d2adffb..3fcd739 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -74,20 +74,37 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init; > static void __init reserve_crashkernel(void) > { > unsigned long long crash_base, crash_size; > + 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; > + if (ret || !crash_size) { > + /* crashkernel=X,high */ > + ret = parse_crashkernel_high(boot_command_line, > + memblock_phys_mem_size(), > + &crash_size, &crash_base); > + if (ret || !crash_size) > + return; > + high = true; > + } > > crash_size = PAGE_ALIGN(crash_size); > > if (crash_base == 0) { > - /* Current arm64 boot protocol requires 2MB alignment */ > - crash_base = memblock_find_in_range(0, ARCH_LOW_ADDRESS_LIMIT, > - crash_size, SZ_2M); > + /* > + * Try low memory first and fall back to high memory > + * unless "crashkernel=size[KMG],high" is specified. > + */ > + if (!high) > + crash_base = memblock_find_in_range(0, > + ARCH_LOW_ADDRESS_LIMIT, > + crash_size, CRASH_ALIGN); > + if (!crash_base) > + crash_base = memblock_find_in_range(0, > + memblock_end_of_DRAM(), > + crash_size, CRASH_ALIGN); > if (crash_base == 0) { > pr_warn("cannot allocate crashkernel (size:0x%llx)\n", > crash_size); > @@ -105,13 +122,18 @@ static void __init reserve_crashkernel(void) > return; > } > > - if (!IS_ALIGNED(crash_base, SZ_2M)) { > + if (!IS_ALIGNED(crash_base, CRASH_ALIGN)) { > pr_warn("cannot reserve crashkernel: base address is not 2MB aligned\n"); > return; > } > } > memblock_reserve(crash_base, crash_size); > > + if (crash_base >= SZ_4G && reserve_crashkernel_low()) { > + memblock_free(crash_base, crash_size); > + return; This is going to be annoying on platforms that don't have, and don't need memory below 4G. A "crashkernel=...,low" on these system will break crashdump. I don't think we should expect users to know the memory layout. (I'm assuming distro's are going to add a low reservation everywhere, just in case) I think the 'low' region should be a small optional/best-effort extra, that kexec-tools can't touch. I'm afraid you've missed the ugly bit of the crashkernel reservation... arch/arm64/mm/mmu.c::map_mem() marks the crashkernel as 'nomap' during the first pass of page-table generation. This means it isn't mapped in the linear map. It then maps it with page-size mappings, and removes the nomap flag. This is done so that arch_kexec_protect_crashkres() and arch_kexec_unprotect_crashkres() can remove the valid bits of the crashkernel mapping. This way the old-kernel can't accidentally overwrite the crashkernel. It also saves us if the old-kernel and the crashkernel use different memory attributes for the mapping. As your low-memory reservation is intended to be used for devices, having it mapped by the old-kernel as cacheable memory is going to cause problems if those CPUs aren't taken offline and go corrupting this memory. (we did crash for a reason after all) I think the simplest thing to do is mark the low region as 'nomap' in reserve_crashkernel() and always leave it unmapped. We can then describe it via a different string in /proc/iomem, something like "Crash kernel (low)". Older kexec-tools shouldn't use it, (I assume its not using strncmp() in a way that would do this by accident), and newer kexec-tools can know to describe it in the DT, but it can't write to it. Thanks, James