From patchwork Tue Apr 9 07:31:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5371B1390 for ; Tue, 9 Apr 2019 07:21:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37A272882F for ; Tue, 9 Apr 2019 07:21:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C0762884A; Tue, 9 Apr 2019 07:21:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EC5A2882F for ; Tue, 9 Apr 2019 07:21:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A357C6B000D; Tue, 9 Apr 2019 03:21:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 996656B0266; Tue, 9 Apr 2019 03:21:08 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E9796B0269; Tue, 9 Apr 2019 03:21:08 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by kanga.kvack.org (Postfix) with ESMTP id 4DC016B000D for ; Tue, 9 Apr 2019 03:21:08 -0400 (EDT) Received: by mail-ot1-f72.google.com with SMTP id f11so9433559otl.20 for ; Tue, 09 Apr 2019 00:21:08 -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:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L9SLP2c/iQfBHl1G8VYuSHf9dO1JsLc3WxrsdgDGbc0=; b=dkvZiVs6EQgRxPkTqfeDWP88he+6Z8ziJuDPTICwRAoFF5Q7uD39LZRo00ztARNKgl kCswZOrzCXD2Ye4SsrqPzkU9XYROYoULH2BWgO3Mb6Eb9u6v642Lu4iNHxX4RbKKjdVK dTnHVe33fc5a+zRjo1xaqSrhJxkNboz47TeqJvz0s16gzIDxUPFnZyA36F7hh7wLZQ4L elhyyJorzCNhTYuliwT9oaWStv2fKt6OsZvyUre8JWbEiyFw1CfIc7Si8xLZSUUuX0jo qqlEVqKKa22NIfTOJcla6/+4f3O7+yPR3KyX3QZLDXhom/KnvnPcjRPfVMxcnbaBn0bt VQBA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAUNh1mOVpYkkhQsVESc+jKtFSwR6C+mda/13JzcpYLL7EI75hN5 Ke/q2+yrG9nmryI7izNKjmeY7YbjpS2h0FI2yocfGAjU6Ck2kKIYX4d6MkWjmNPiZBmTTgc7O1q S3uVnnFFP4g/WHYIOYJc7gmnqP8cBSaUzmXCMRvlqbt1hDKO0/CO5RU2UDI9Fg5ZxnQ== X-Received: by 2002:aca:1303:: with SMTP id e3mr17600425oii.140.1554794467993; Tue, 09 Apr 2019 00:21:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqw70ys0tOHxzB/u02W4ZJ3xE4b0xxHLeT+Ag+u2UPdSAPVqxGTx1yPcPDa4nSI3Usdjvor0 X-Received: by 2002:aca:1303:: with SMTP id e3mr17600384oii.140.1554794466301; Tue, 09 Apr 2019 00:21:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554794466; cv=none; d=google.com; s=arc-20160816; b=hStQQI/ja4LN6N6CLSvM1jk0ZERvnao3Y6cc6dmF2Rsdeqne4Qexku6HnJoH/GYhiu eugKG30ieqOAaLVIT7nCHpucaVmcs008iJoHMYi/IqnmyYl323i9txxzmit8ZtWOpLjJ G9m/1VizooT1qPOw3srLxIDdclL0B2FdDOWnApko5y/iSYS9tsKT/gt0+8WPe/yp0+uu nNhv8fI37OXs8wZuuz3FTH1F4m6YZYtpqWmCuGp6T71LIitE6eBPXlpMUszK8qHl3qFj 6QeQJbIDrJiU5liYXfOfuMuAy3usv48nJG8S7GUHpJIE6G+0mGUzZ488X90repnl9rNP tmEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=L9SLP2c/iQfBHl1G8VYuSHf9dO1JsLc3WxrsdgDGbc0=; b=X4eR4CwE2jlRiwymnUAU6zXHZl2shsovIdhHdFREEvK/qQ+Fkyw670TjXmbQaAvMuK H9GMeLoFypXa6JTKHl7sYYyhr4tbC9FBAw6V9udma1LefrbSg3M0y+YKn888OjSGHlfN guzatVvYGZ8lrvYhyThjr3aiiPJSTTMR4uqDrbs5e0itnQjF66FlBvdAus/klUrCO+kG xBA7V+Ij5wtezjw6vulIEri7p241rT4z33m255FrLPa66vMfMQwBwl7xIir4fQIESrAh N353I6oN/gfc3dqiCmSTT9qKdfeVzG12qeUwj6vIp29E5CXNFvM5IfZgNE0A47iQWDtX YEGw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga07-in.huawei.com. [45.249.212.35]) by mx.google.com with ESMTPS id d4si15291484oih.83.2019.04.09.00.21.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 00:21:06 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) client-ip=45.249.212.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 9BF98538DF1686C1E0B8; Tue, 9 Apr 2019 15:21:00 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Tue, 9 Apr 2019 15:20:49 +0800 From: Chen Zhou To: , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v2 1/3] arm64: kdump: support reserving crashkernel above 4G Date: Tue, 9 Apr 2019 15:31:41 +0800 Message-ID: <20190409073143.75808-2-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409073143.75808-1-chenzhou10@huawei.com> References: <20190409073143.75808-1-chenzhou10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected 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: X-Virus-Scanned: ClamAV using ClamSMTP When crashkernel is reserved above 4G in memory, kernel should reserve some amount of low memory for swiotlb and some DMA buffers. Kernel would try to allocate at least 256M below 4G automatically as x86_64 if crashkernel is above 4G. Meanwhile, support crashkernel=X,[high,low] in arm64. Signed-off-by: Chen Zhou --- arch/arm64/include/asm/kexec.h | 3 ++ arch/arm64/kernel/setup.c | 3 ++ arch/arm64/mm/init.c | 26 +++++++++++++---- arch/x86/include/asm/kexec.h | 3 ++ arch/x86/kernel/setup.c | 66 +++++------------------------------------- include/linux/kexec.h | 1 + kernel/kexec_core.c | 53 +++++++++++++++++++++++++++++++++ 7 files changed, 91 insertions(+), 64 deletions(-) diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 67e4cb7..32949bf 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -28,6 +28,9 @@ #define KEXEC_ARCH KEXEC_ARCH_AARCH64 +/* 2M alignment for crash kernel regions */ +#define CRASH_ALIGN SZ_2M + #ifndef __ASSEMBLY__ /** 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); diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 972bf43..3bebddf 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -64,6 +64,7 @@ EXPORT_SYMBOL(memstart_addr); phys_addr_t arm64_dma_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE + /* * reserve_crashkernel() - reserves memory for crash kernel * @@ -74,20 +75,30 @@ 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); + crash_base = memblock_find_in_range(0, + high ? memblock_end_of_DRAM() + : ARCH_LOW_ADDRESS_LIMIT, + crash_size, CRASH_ALIGN); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", crash_size); @@ -105,13 +116,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; + } + pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n", crash_base, crash_base + crash_size, crash_size >> 20); diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index 003f2da..485a514 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -18,6 +18,9 @@ # define KEXEC_CONTROL_CODE_MAX_SIZE 2048 +/* 16M alignment for crash kernel regions */ +#define CRASH_ALIGN (16 << 20) + #ifndef __ASSEMBLY__ #include diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3773905..4182035 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -447,9 +447,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) #ifdef CONFIG_KEXEC_CORE -/* 16M alignment for crash kernel regions */ -#define CRASH_ALIGN (16 << 20) - /* * Keep the crash kernel below this limit. On 32 bits earlier kernels * would limit the kernel to the low 512 MiB due to mapping restrictions. @@ -463,59 +460,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) # define CRASH_ADDR_HIGH_MAX MAXMEM #endif -static int __init reserve_crashkernel_low(void) -{ -#ifdef CONFIG_X86_64 - unsigned long long base, low_base = 0, low_size = 0; - unsigned long total_low_mem; - int ret; - - total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT)); - - /* crashkernel=Y,low */ - ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base); - if (ret) { - /* - * two parts from lib/swiotlb.c: - * -swiotlb size: user-specified with swiotlb= or default. - * - * -swiotlb overflow buffer: now hardcoded to 32k. We round it - * to 8M for other buffers that may need to stay low too. Also - * make sure we allocate enough extra low memory so that we - * don't run out of DMA buffers for 32-bit devices. - */ - low_size = max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20); - } else { - /* passed with crashkernel=0,low ? */ - if (!low_size) - return 0; - } - - low_base = memblock_find_in_range(0, 1ULL << 32, low_size, CRASH_ALIGN); - if (!low_base) { - pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n", - (unsigned long)(low_size >> 20)); - return -ENOMEM; - } - - ret = memblock_reserve(low_base, low_size); - if (ret) { - pr_err("%s: Error reserving crashkernel low memblock.\n", __func__); - return ret; - } - - pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n", - (unsigned long)(low_size >> 20), - (unsigned long)(low_base >> 20), - (unsigned long)(total_low_mem >> 20)); - - crashk_low_res.start = low_base; - crashk_low_res.end = low_base + low_size - 1; - insert_resource(&iomem_resource, &crashk_low_res); -#endif - return 0; -} - static void __init reserve_crashkernel(void) { unsigned long long crash_size, crash_base, total_mem; @@ -573,9 +517,13 @@ static void __init reserve_crashkernel(void) return; } - if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) { - memblock_free(crash_base, crash_size); - return; + if (crash_base >= (1ULL << 32)) { + if (reserve_crashkernel_low()) { + memblock_free(crash_base, crash_size); + return; + } + + insert_resource(&iomem_resource, &crashk_low_res); } pr_info("Reserving %ldMB of memory at %ldMB for crashkernel (System RAM: %ldMB)\n", diff --git a/include/linux/kexec.h b/include/linux/kexec.h index b9b1bc5..6140cf8 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -281,6 +281,7 @@ extern void __crash_kexec(struct pt_regs *); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); int kexec_crash_loaded(void); +int __init reserve_crashkernel_low(void); void crash_save_cpu(struct pt_regs *regs, int cpu); extern int kimage_crash_copy_vmcoreinfo(struct kimage *image); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index d714044..f8e8f80 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -39,6 +39,8 @@ #include #include #include +#include +#include #include #include @@ -96,6 +98,57 @@ int kexec_crash_loaded(void) } EXPORT_SYMBOL_GPL(kexec_crash_loaded); +int __init reserve_crashkernel_low(void) +{ + unsigned long long base, low_base = 0, low_size = 0; + unsigned long total_low_mem; + int ret; + + total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT)); + + /* crashkernel=Y,low */ + ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base); + if (ret) { + /* + * two parts from lib/swiotlb.c: + * -swiotlb size: user-specified with swiotlb= or default. + * + * -swiotlb overflow buffer: now hardcoded to 32k. We round it + * to 8M for other buffers that may need to stay low too. Also + * make sure we allocate enough extra low memory so that we + * don't run out of DMA buffers for 32-bit devices. + */ + low_size = max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20); + } else { + /* passed with crashkernel=0,low ? */ + if (!low_size) + return 0; + } + + low_base = memblock_find_in_range(0, 1ULL << 32, low_size, CRASH_ALIGN); + if (!low_base) { + pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n", + (unsigned long)(low_size >> 20)); + return -ENOMEM; + } + + ret = memblock_reserve(low_base, low_size); + if (ret) { + pr_err("%s: Error reserving crashkernel low memblock.\n", __func__); + return ret; + } + + pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n", + (unsigned long)(low_size >> 20), + (unsigned long)(low_base >> 20), + (unsigned long)(total_low_mem >> 20)); + + crashk_low_res.start = low_base; + crashk_low_res.end = low_base + low_size - 1; + + return 0; +} + /* * When kexec transitions to the new kernel there is a one-to-one * mapping between physical and virtual addresses. On processors From patchwork Tue Apr 9 07:31:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B10EB1390 for ; Tue, 9 Apr 2019 07:21:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96A2B2882F for ; Tue, 9 Apr 2019 07:21:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AFEF2884A; Tue, 9 Apr 2019 07:21:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF4E42882F for ; Tue, 9 Apr 2019 07:21:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15FC66B000C; Tue, 9 Apr 2019 03:21:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 01F156B000D; Tue, 9 Apr 2019 03:21:07 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE2F86B0010; Tue, 9 Apr 2019 03:21:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by kanga.kvack.org (Postfix) with ESMTP id A262B6B000C for ; Tue, 9 Apr 2019 03:21:07 -0400 (EDT) Received: by mail-oi1-f199.google.com with SMTP id i203so7016677oih.16 for ; Tue, 09 Apr 2019 00:21:07 -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:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=e3rr6aKDQW1gxAlq+d83ilx9o3h4aAQlcXfr3180xvg=; b=n5QimYwwr40telgJYob/3/R8VwWRosD/DkIK05eWyKMoGDUi9LTnjl1GN+gAAHvhUC AhfF8muUl+VnVifGcPT0zbWyIubqLVFvc7OIEFTIA9yCy5l3518fcEE2nf8URPn9Qsam IDZIimH2N8WLC5dJF0pXE2Ky4fzc1ZN3cwFMNeqXTD393CGSwYgDAfRJrb+k+YayqdJb HoLeAl7iu2rxO1Dh+nyGYejwaLYzkrBUlm/3itbn5klqdLXGK8Gn5LLKKqIS7w4gYsvf YcDz0j4k/7omNOLJQibFp1k2FxDZhzIA7TL0OJudxtrhgJzh1aS+P8QEjgEDh4zZ33WC 9oPw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAXyeM5VSj3L5b6h+wbd0fJ2vDrWWVz70xr+6M/61PLPxX2f3SIi iYbadaF0wMpkkBeQjBX5B1aZr0IIESqi6D3LgMFVwbvGbDV/9Sdya9JxvuVQdU6ftOsmLWDadYx 6NGm56OsB698iqIAetRs+Zwr06nANClGJ82CjAKb9xJx3d1ET6NO6zzVFcb2rF4lBYQ== X-Received: by 2002:aca:6c41:: with SMTP id h62mr19142164oic.34.1554794467351; Tue, 09 Apr 2019 00:21:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6itZ0t6uRejGyX1diY9IWJwovrjkh278CIv6unFniJvOAy1rE0/n12wkfzM+py9fUpCdM X-Received: by 2002:aca:6c41:: with SMTP id h62mr19142113oic.34.1554794465802; Tue, 09 Apr 2019 00:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554794465; cv=none; d=google.com; s=arc-20160816; b=Gewcb3Q042Wv/Dex9wTsv7x0KBGjbKL4VF2ZU2RSgbRv1Mx4DQAGAtCw7vX4+ygv2N MPwCDOIz1Ngl46TJmK2d8I16YPbm+L8RLb5zyyLrEHp7XsEdgnn9taSEBtViYzR8rEok GsAulePfSv4WSoqRzXxGACdDltpRvKYwc9tsM8VsvZMevULxyMo/y9eVPa8KiVlDM7l9 yIobXJIk7azfCb01iNr0p0ZNWE9AEaNCbPg3fmG9Z7klPHSwe7sKVe/4gjzfQ32jKoQk Oq7DmtJYoWTWYDGTr9V8DaZ4Zoh/dnd7Bn0fMOUqF+63r7Blp71Spi8ECcrfAu3CZtTm uP7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=e3rr6aKDQW1gxAlq+d83ilx9o3h4aAQlcXfr3180xvg=; b=tDoZFhGgaup74PdweJi1S3ipunsqcVHb9WNt2al7iJhfvikvq2eCtqZlShzPtDl8y+ rTHY8cQhnxksvl5eOqYkbalj/HX76GLkmrkezcUQt3fdXesLlIQb8HM2nJmGnE7eckQA uVzigrOpc3GYeypJJmJLz8rxvuDG/dqrHLmSCMRqlSYDM+CBk1ONng397qR/oRxddAmB x6IElZEzCU2jQ+2r5z90DdX7UXCG+evt2k7Sm4iT/TFJfAqUBs6PywQEMWSIyPLBoSMR poQF67adgXyzx+bqJUJPaYbB8HAXrKfD2rgHWvlq/w16Xlj+iUL2m3iiSStzic7gAtYg fJWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga07-in.huawei.com. [45.249.212.35]) by mx.google.com with ESMTPS id h3si15032262otj.201.2019.04.09.00.21.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 00:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) client-ip=45.249.212.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 93BD059EB87F8BBCF1A4; Tue, 9 Apr 2019 15:21:00 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Tue, 9 Apr 2019 15:20:52 +0800 From: Chen Zhou To: , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v2 2/3] arm64: kdump: support more than one crash kernel regions Date: Tue, 9 Apr 2019 15:31:42 +0800 Message-ID: <20190409073143.75808-3-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409073143.75808-1-chenzhou10@huawei.com> References: <20190409073143.75808-1-chenzhou10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected 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: X-Virus-Scanned: ClamAV using ClamSMTP 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 | 66 ++++++++++++++++++++++++++++++++++++++++-------- include/linux/memblock.h | 6 +++++ mm/memblock.c | 7 ++--- 3 files changed, 66 insertions(+), 13 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 3bebddf..0f18665 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -65,6 +65,11 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE +/* at most two crash kernel regions, low_region and high_region */ +#define CRASH_MAX_USABLE_RANGES 2 +#define LOW_REGION_IDX 0 +#define HIGH_REGION_IDX 1 + /* * reserve_crashkernel() - reserves memory for crash kernel * @@ -297,8 +302,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; @@ -307,22 +312,63 @@ 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, - }; + 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 - 1 == LOW_REGION_IDX) + memblock_cap_memory_range(regs[LOW_REGION_IDX].base, + regs[LOW_REGION_IDX].size); + else if (cnt - 1 == HIGH_REGION_IDX) { + /* + * Two crash kernel regions, cap the memory range + * [regs[LOW_REGION_IDX].base, regs[HIGH_REGION_IDX].end] + * and then remove the memory range in the middle. + */ + int start_rgn, end_rgn, i, ret; + phys_addr_t mid_base, mid_size; + + mid_base = regs[LOW_REGION_IDX].base + regs[LOW_REGION_IDX].size; + mid_size = regs[HIGH_REGION_IDX].base - mid_base; + ret = memblock_isolate_range(&memblock.memory, mid_base, + mid_size, &start_rgn, &end_rgn); - of_scan_flat_dt(early_init_dt_scan_usablemem, ®); + if (ret) + return; - if (reg.size) - memblock_cap_memory_range(reg.base, reg.size); + memblock_cap_memory_range(regs[LOW_REGION_IDX].base, + regs[HIGH_REGION_IDX].base - + regs[LOW_REGION_IDX].base + + regs[HIGH_REGION_IDX].size); + for (i = end_rgn - 1; i >= start_rgn; i--) { + if (!memblock_is_nomap(&memblock.memory.regions[i])) + memblock_remove_region(&memblock.memory, i); + } + memblock_remove_range(&memblock.reserved, mid_base, + mid_base + mid_size); + } } void __init arm64_memblock_init(void) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 294d5d8..787d252 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -110,9 +110,15 @@ void memblock_discard(void); phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align); +void memblock_remove_region(struct memblock_type *type, unsigned long r); void memblock_allow_resize(void); int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid); int memblock_add(phys_addr_t base, phys_addr_t size); +int memblock_isolate_range(struct memblock_type *type, + phys_addr_t base, phys_addr_t size, + int *start_rgn, int *end_rgn); +int memblock_remove_range(struct memblock_type *type, + phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_free(phys_addr_t base, phys_addr_t size); int memblock_reserve(phys_addr_t base, phys_addr_t size); diff --git a/mm/memblock.c b/mm/memblock.c index e7665cf..1846e2d 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -357,7 +357,8 @@ phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start, return ret; } -static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) +void __init_memblock memblock_remove_region(struct memblock_type *type, + unsigned long r) { type->total_size -= type->regions[r].size; memmove(&type->regions[r], &type->regions[r + 1], @@ -724,7 +725,7 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) * Return: * 0 on success, -errno on failure. */ -static int __init_memblock memblock_isolate_range(struct memblock_type *type, +int __init_memblock memblock_isolate_range(struct memblock_type *type, phys_addr_t base, phys_addr_t size, int *start_rgn, int *end_rgn) { @@ -784,7 +785,7 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type, return 0; } -static int __init_memblock memblock_remove_range(struct memblock_type *type, +int __init_memblock memblock_remove_range(struct memblock_type *type, phys_addr_t base, phys_addr_t size) { int start_rgn, end_rgn; From patchwork Tue Apr 9 07:31:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01D841390 for ; Tue, 9 Apr 2019 07:21:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD71E2882F for ; Tue, 9 Apr 2019 07:21:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D18D12884A; Tue, 9 Apr 2019 07:21:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48D1A2882F for ; Tue, 9 Apr 2019 07:21:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E4CD6B0008; Tue, 9 Apr 2019 03:21:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 06CBC6B000C; Tue, 9 Apr 2019 03:21:07 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E76DF6B000D; Tue, 9 Apr 2019 03:21:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by kanga.kvack.org (Postfix) with ESMTP id BA7D56B0008 for ; Tue, 9 Apr 2019 03:21:06 -0400 (EDT) Received: by mail-oi1-f199.google.com with SMTP id v1so7012023oif.12 for ; Tue, 09 Apr 2019 00:21:06 -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:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ok8I24TtxuWgDq0ME4RBGiLUC2kWpehBcB4g0fC0unk=; b=eq/tPTgQto8uLbV676B8BlV7Wo/XElyDsq7bdWNvpebxN8PnMAqMKwy6IZTmq7XZpC RP3HoTQY1LfUvZG7Kg5E9VdsFlF2BY6/vhS005FvBtH7QARSmayYA/ehbo3X0T6DTnff 3ZjPi8KXzpczbMZrm60sXCg2LVQTOMc/Ciu2o/4Isjelm5MmMzKV66A1Wfo/Z/+pDzzz 6nhJvOgUbuSegAyeSkzNbAr2VpP4rgS2bTh8yB89ajlZ/WuaiwjVL1kHS24W0Tkf9H+r YEPCCc8EOS4aqXMryasb5a9mlVVH8jJDkoBKN0gTN1qM03omBWXkQ2MWEBNp4JP+I94N 6N4Q== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAVWuLDSDanlUYMAQjOEn9TV8ouYJComNi+kTUxeiR4LlH1F3gSs yQ9+jiWma81LRVMUqT9JKIYHsLmBIla99B50YnR8PvnzeKVBlIZvgFxvGS6Al0vRlhgH5dSrIqr TmPRoNr9FlJ44Eqk+v11Sj55Iwjcjt4AHOfF1iLVEh8govefFtJJmRSgs8S9ZltUgNg== X-Received: by 2002:a9d:76cf:: with SMTP id p15mr22575031otl.310.1554794466419; Tue, 09 Apr 2019 00:21:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzG+9Povlv8P+Fcqh4pFasSnzjRw25sQmlnJVHcSzaEyhQoM2bCfpHviXCYgA+sviiTkeBA X-Received: by 2002:a9d:76cf:: with SMTP id p15mr22575007otl.310.1554794465736; Tue, 09 Apr 2019 00:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554794465; cv=none; d=google.com; s=arc-20160816; b=rcB5HD5MQ6BUFt/bvg7B8PmOj7VyAmDYZShHkaAI+fM+mk5mBCF19ew4DJZFn+HlEL ZTCUIN9yyIxfXvEXSK5v8R2EQ1UO9CT6hBz6I2+eeTspsvRsc7Y3FBSjK8cgLjvYs5AV 0wvJ/TnWjDoEBpB5vY58DiwfG9/JqfmPWDv1/clRqCO/yqolhmf8LrEJ0sWsRRsgu+3R PKNFZ8omeA7+JtHZ5CLmDoZmvJAi33KINGn6A9nTQlqD4Qg5fW7VtjvdAkRz4C4YLdQm PFP1VQrdnjOkVpK9PN7Hj+0GRwM5C3zBpI0qSZQ4eNKzIh6f2xV3MLSArEOoj5GuX+J4 9OYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ok8I24TtxuWgDq0ME4RBGiLUC2kWpehBcB4g0fC0unk=; b=DMbUgYZMN4MD0Wh4D/BxZEM2S20W/uRRIglWnA9j2V5h/Dd6CV831klBc6LJBw5aET reTBAZEN9Tu95V46G+7rXF28T8GwkA/e64sUnN25Y4XbfGbFebAnX0Q/uxpArtJwv8Jh n4fdJGQXY04XYZYghGAE6UV2ejfAuU41olyTaZso/CfoBvztxZT5P4DJ45R4qDXS0Ws2 WFVGBPlHIHSucHSTDtA1MPjdwUwuTOAU+1thluKn1DibvQJFUfE7YA3/jEzN7+UjAwxi 49GE85HWfBcR3mxbwU2kcNVwlUcF0ofk2x5/q/p+WHsPR8KKoOe90DB/BIsCgN3AJNsf c9iw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga07-in.huawei.com. [45.249.212.35]) by mx.google.com with ESMTPS id p21si15294724oto.291.2019.04.09.00.21.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 00:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) client-ip=45.249.212.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 8C0E77D3C200B2A62F21; Tue, 9 Apr 2019 15:21:00 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Tue, 9 Apr 2019 15:20:54 +0800 From: Chen Zhou To: , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v2 3/3] kdump: update Documentation about crashkernel on arm64 Date: Tue, 9 Apr 2019 15:31:43 +0800 Message-ID: <20190409073143.75808-4-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409073143.75808-1-chenzhou10@huawei.com> References: <20190409073143.75808-1-chenzhou10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected 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: X-Virus-Scanned: ClamAV using ClamSMTP Now we support crashkernel=X,[high,low] on arm64, update the Documentation. Signed-off-by: Chen Zhou --- Documentation/admin-guide/kernel-parameters.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 060482d..d5c65e1 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -715,14 +715,14 @@ Documentation/kdump/kdump.txt for an example. crashkernel=size[KMG],high - [KNL, x86_64] range could be above 4G. Allow kernel + [KNL, x86_64, arm64] range could be above 4G. Allow kernel to allocate physical memory region from top, so could be above 4G if system have more than 4G ram installed. Otherwise memory region will be allocated below 4G, if available. It will be ignored if crashkernel=X is specified. crashkernel=size[KMG],low - [KNL, x86_64] range under 4G. When crashkernel=X,high + [KNL, x86_64, arm64] range under 4G. When crashkernel=X,high is passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb