From patchwork Tue Apr 9 10:28:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890891 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 E6190922 for ; Tue, 9 Apr 2019 10:17:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1437288A0 for ; Tue, 9 Apr 2019 10:17:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5620288AA; Tue, 9 Apr 2019 10:17:46 +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 D0584288AC for ; Tue, 9 Apr 2019 10:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47FB86B0010; Tue, 9 Apr 2019 06:17:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4329B6B0266; Tue, 9 Apr 2019 06:17:39 -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 2D3596B0269; Tue, 9 Apr 2019 06:17:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by kanga.kvack.org (Postfix) with ESMTP id 083A96B0010 for ; Tue, 9 Apr 2019 06:17:39 -0400 (EDT) Received: by mail-vk1-f197.google.com with SMTP id v4so6013657vka.10 for ; Tue, 09 Apr 2019 03:17:39 -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=TeOuXwnzP0/2bZoD0vz687cTVHAax5QzABrgfzFZYnM=; b=XAogGmVS5ZhDfFV0GzNU8RRApIEVyj4c8qFzU0qNGis3DlRmgNYpUKGzs8HxFJkftr Lm1WxF1R8ZRxK/NyHJDBvjDleDoWmD3/j7b3Fx3xjnGZ9PrKfG4u1zrOxQQQQ4rOXC0D MKayveOkwwIA8Bdki1RXOb0ISTl5DzuJ4WVS/mMFaqow/JH1Zclg3Og6gDXo9t6tYj1A xB9gpVRHOnUB4qdhJDSqDoO3zb30oXGqvMckQClmwoxShlvVe5OOg4wz+eB3flKzj2b2 yy96OSIBriV1nF3w9lQJWq8ehqXkoNz8wIyMXdrAaRQz0WEPkrs1bMXT0resPqZH4Z6f tgwA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAUjOH/Ly4n/yCuXmkhKv8qcGuR05c3emDi1FcyhQng6hC/EfY/v yBZwwtKpFpzSX0jA2oYcAs32Ntgq3AALEiMzXbJjVHoSbYAqnjrUeNy+CGquv/JtNT01Y0t/6te agPHBWRiVGANdnlZegY9ZC8thyWRyNoQub2GuciSDPXSqhGAdK/y3VEaUsK+XN/MyUg== X-Received: by 2002:a67:f416:: with SMTP id p22mr20084019vsn.175.1554805058656; Tue, 09 Apr 2019 03:17:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxQwoTi85OIRmNXE7qOxqiUAf8k11fvgPXV8XnLDp/NmSbv+dLRN4OOcheBPcVq+sxIpAV5 X-Received: by 2002:a67:f416:: with SMTP id p22mr20083951vsn.175.1554805057028; Tue, 09 Apr 2019 03:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554805057; cv=none; d=google.com; s=arc-20160816; b=K0lLaqltnkygDLN18VIhzBS/wOp9DcPMIUb33+NLnY5z/qzGaQMy63i6xSJUTG5FfL uPE8Tjsmnoo3k1U6CF6mv60FcKdRTgjsQJICs8pXfIrFL6CrZuU+OeGPDImZEuKWeI3y xEvDX8EdAT29BXKfAWI7vsHhxjRD3bnxU5xZt8JFpuDN5hE8chd2zIYp5OsS5P/Gj/pr M5pmePjQcPdIsZfC9T1x730wCaMNV7IcFl9d+zc5seoPyE+9pBY23qHTCNXAcqZx+la/ jUVBDlkg7HUy44Fo4SfvKCHwZpNGISNCJvTPeCTBz5zBcrLKk2FFglt6Q5Tzw5V8Phav 23Ew== 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=TeOuXwnzP0/2bZoD0vz687cTVHAax5QzABrgfzFZYnM=; b=TIE2b4GQgvxBeuv1K9DVI2uTWQ9wNM1WpWsk9YgPtv8EPRHd11TnveRt2+8e5vLpfL /nCuY31/JOgj22/Ua6tHGQpt3Ytr0b3Ak20DbuWeO7aWqorRBAHrl9yQtGBV4KItLMA8 7cdpkrAkPaagsFsfL7d57dPFJewrM0a/2kttTBjecPuEMVEcN+qTEWQ4b0g8rOA5Dsi2 +2o9MnMuWBJ313iCWEUWUJ5HTtp8qwbMP7EWMeKBGutgRbV32oxVuPz2ilQ4cT46NpX9 tTNaSxvDIiQa/SxLNXUrN0Eil/S+bdSgJ2fT8xdjSIaKoqzbvxxX0IsFQGg1S9wdfJBh dGOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga06-in.huawei.com. [45.249.212.32]) by mx.google.com with ESMTPS id s12si5363628vss.204.2019.04.09.03.17.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 03:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) client-ip=45.249.212.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 4E19590136526AEF6836; Tue, 9 Apr 2019 18:17:31 +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 18:17:22 +0800 From: Chen Zhou To: , , , , , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v3 1/4] x86: kdump: move reserve_crashkernel_low() into kexec_core.c Date: Tue, 9 Apr 2019 18:28:16 +0800 Message-ID: <20190409102819.121335-2-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409102819.121335-1-chenzhou10@huawei.com> References: <20190409102819.121335-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 In preparation for supporting more than one crash kernel regions in arm64 as x86_64 does, move reserve_crashkernel_low() into kexec/kexec_core.c. Signed-off-by: Chen Zhou --- arch/x86/include/asm/kexec.h | 3 ++ arch/x86/kernel/setup.c | 66 +++++--------------------------------------- include/linux/kexec.h | 1 + kernel/kexec_core.c | 53 +++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 59 deletions(-) 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 10:28:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890887 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 24EE61708 for ; Tue, 9 Apr 2019 10:17:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10A38288AC for ; Tue, 9 Apr 2019 10:17:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01B04288AF; Tue, 9 Apr 2019 10:17:39 +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 66509288AC for ; Tue, 9 Apr 2019 10:17:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8015C6B000D; Tue, 9 Apr 2019 06:17:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7B14F6B0010; Tue, 9 Apr 2019 06:17:38 -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 69FDE6B0266; Tue, 9 Apr 2019 06:17:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by kanga.kvack.org (Postfix) with ESMTP id 427E76B000D for ; Tue, 9 Apr 2019 06:17:38 -0400 (EDT) Received: by mail-vs1-f69.google.com with SMTP id h23so2766788vsp.14 for ; Tue, 09 Apr 2019 03:17:38 -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=BbYjAm+yXyOq6O85Gve2jDCfjYogITxlH3pTVha67WQ=; b=PF+7oPEo6+N4nng8DbjcEPkXlzys6F51xT/UpWnKX7LGmln3UVr6DyLlzC0KE1loZj LhnHuNYma18YAAQacPvwicqq5r1xE5kP0tGTr+ZytfNPM+Zy5ecsvMCzrVZq0h7/nKsT /qEyrnAhmZLRMGhx80VsQp/bpT4LW1W0h4qNxkUp7Y/P8fN9PVu1Sp/gkh8E8W9WowIy d58go78co/dO+/sbgXT10+PPG9Y/eAv7N9b48GHPzU0NpCunY525lx4wm9hcyVexnkpg aHJ00JrHcMccEhRLeyeYcW6/LIOwlAY9MOYFT2EhU+iPR1kSPJnzwqFtatNKihDcN769 eObg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com X-Gm-Message-State: APjAAAVbprHIZyfYsI2+Pt2kLUKy3EJ+1q6J9dyR+sbIcqGL2icKD8pY MyiNjNO4KTtJijaPofov4Qz/KhpfdSnrt+5zDT9a3yASnPmmWVAVZA5R3CmIvh43qkaqzOPx88Y AqQ8vAo8gIn7r4wr7vu+e7zIkiEt9k8lxLMJekp0V0CR9OwWQNKihWgQ3OacIBMk3zw== X-Received: by 2002:a67:e20c:: with SMTP id g12mr20769845vsa.188.1554805057983; Tue, 09 Apr 2019 03:17:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwX84mCGR2gdRwwcn8tNyw0D88modxXemVmfvMvB2blGdMCKweQyShCZxxH9PWpL9yvGqsF X-Received: by 2002:a67:e20c:: with SMTP id g12mr20769810vsa.188.1554805057032; Tue, 09 Apr 2019 03:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554805057; cv=none; d=google.com; s=arc-20160816; b=N6jGCkSI/Y6Rfctcndubp9PYOe0qgjZ7ALcelxOfq4CU3v4wbPLUhdDRaVKCmte61X BPyHwBU3qFmzXW9BcADq8f+qHqSEfytMz1E04It7uIBHOIHw+OJghOv8diRYUHe7ohvt biVyLpXOe5+JGI+Ke86VnIYS8efbCjTjR1ikYULeQvmDEr7M/s/1vuPWj/uYsVY5m8MV 7CXESrh1eii63ub8kA39DhpqC0rapfefGJWdaS1YNJgXVsXq9gKAmXThKYxhmoHINkzw k9twBjSFa4toKUvMe5yhd2Ga426v9y5zom+oLBCle+DvqLODxFXm+OdUIc+TKCw4Bq7r 1Plg== 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=BbYjAm+yXyOq6O85Gve2jDCfjYogITxlH3pTVha67WQ=; b=HKJC5init35TqFaWi4gPOZ672bRRre9Efz3aXJf6VmO/LtK1gR3nOf4/DJUNGyQpIU 6erWKhN6j7yPDGSqp8+nKfLXol3BTcPbLr/JjgCPuP6OBk2RDZJkLAjDuuXT0ujSVhUt izV8LkrbRgnfVe+UzBy1fksnGs9h1/CzmScsHFeNfUZ6IJTXITGLXkR1EbvqcM3jbDUo zUY03IKvpnEqXRJEOStsw5q9XDFdon4qbpeDjMQ66IYnAChzTostBQZE3Za9AQ90xr5x 2q88XBXJ88OQUqgbT+AE2Hp+C0AFzi+8sytoIHKNxpPIgoqI8TFNSdlEoDSZ4H7Nmyu5 c0hA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from huawei.com (szxga06-in.huawei.com. [45.249.212.32]) by mx.google.com with ESMTPS id q19si6187412vsn.70.2019.04.09.03.17.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 03:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) client-ip=45.249.212.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of chenzhou10@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=chenzhou10@huawei.com Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 5F1B8B18EC5747D21AA4; Tue, 9 Apr 2019 18:17:31 +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 18:17:24 +0800 From: Chen Zhou To: , , , , , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v3 2/4] arm64: kdump: support reserving crashkernel above 4G Date: Tue, 9 Apr 2019 18:28:17 +0800 Message-ID: <20190409102819.121335-3-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409102819.121335-1-chenzhou10@huawei.com> References: <20190409102819.121335-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 +++++++++++++++++++++----- 3 files changed, 27 insertions(+), 5 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); From patchwork Tue Apr 9 10:28:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890903 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 090981390 for ; Tue, 9 Apr 2019 10:30:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA8BD28868 for ; Tue, 9 Apr 2019 10:30:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE8C8288A6; Tue, 9 Apr 2019 10:30:35 +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 4540028868 for ; Tue, 9 Apr 2019 10:30:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 846146B0266; Tue, 9 Apr 2019 06:30:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 81BF66B0269; Tue, 9 Apr 2019 06:30:30 -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 6E5B66B026A; Tue, 9 Apr 2019 06:30:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by kanga.kvack.org (Postfix) with ESMTP id 459F46B0266 for ; Tue, 9 Apr 2019 06:30:30 -0400 (EDT) Received: by mail-oi1-f198.google.com with SMTP id w139so7200105oiw.21 for ; Tue, 09 Apr 2019 03:30:30 -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=Wlt15mkEBZwBKWGvDM09ZqxBZGpMCiuItSBfo6pCeiLNCYyy1LhajqypJtwmECvoWA XsUIZhrgdCpdgy6LN54oJO0t7jxvD47uAvA6FIoc77hn/AHJkP9M4pLPb0mSGnIfG9aD kXY/2Ahux9CoDYpl+C+K/LRG0MOnnomCB+M9huLr2aQTWzL+cWbgAX4J31QyHDaGpm5Y FPtG4d19WQQy9FtaUpDnraWmufJnzb2C4uMu1Ww2wI1DKtIAyH8D80XZdyYRv44XlbyX BxO3Ze8YjN21gTTv01eNk3llPBtPJb5Ws62YGadNSWr61AWXQOys0G7zaSIN2yhESYXR EcCg== 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: APjAAAUxxw+KAkOOO3khgkzdkbwog6WVfoaeMMMgQWsKokSmk3O5z9oa ALDh6MtNDRQTdr9ikp0bzt0GbfDkIBv2io0yBN3zSPnjfzpvUc2dtLprJ2uCJOzPghTvBtC4IMy KjuYbcuXOU/DlW46v0WchN5gwqlj03JFD0uMJy9DEAg2mHJGJiYUgjW/29pk9F0Lcrw== X-Received: by 2002:a05:6830:1446:: with SMTP id w6mr22914364otp.157.1554805830004; Tue, 09 Apr 2019 03:30:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqztffXisW5oKyNn7qBzeuop3widkad/IXKMcc+i1Kuk3BulcuVvQvMRHr3CFTnGSri0W1gJ X-Received: by 2002:a05:6830:1446:: with SMTP id w6mr22914319otp.157.1554805829106; Tue, 09 Apr 2019 03:30:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554805829; cv=none; d=google.com; s=arc-20160816; b=b8tRRMZAoAL/C+bu1nH38Us4pZc68357aEHTRck2lW4E01DtonvY12BXoaiHZ2Psdy 1PtsqV26As5EqbgOU5XEg3edCFA/itLt+/iITvI6yrYZlK1qDhYfM+UT53MemqWKyFAz 6wgMaynBVApX+pyMmax0PoefDHdra3Lzri53obameh8B3Uz+Km8SvjyI5RBOH+27mpmI onCLFHzK8T/sbG9ZK6J4RHXtF3JpSo0jwkYTdJgq9q6o+cknCfkEKIeifF3YuPOttMdH J9CBHrFGEUddnAb9el99QTdKv23V9i1w5UYPsoWrxSjNswqEPWplbj5RleWaF0z37QJv 2pmA== 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=cYrZtdrOG2PR0QmmIYsWv1c2IbdMgquQ66EOcR7O8iVnt4+d+I6Y8wzR2a/Ir5VT1M IwcuLA3wUSne307iNY5Owk0fq8ZXYIW1kZCCvj/VruDZBUnZn7a86J4MckAEPpvlFzyG 3mDA5veGLbcpvOQBK9AVS2zjXaUQrx45ai/42gGM4U7DHP0NGVeqWDcHwqMSfg76eoJZ jvVKTNMLWttYo0qIJ4IwzA/DSk5y55OpNNrV751fAlsEQWkw/aAa/w632z9fDCqWRnN1 X8pR8XngRfhV1SugYxlkvzTErnalho5XhHvUCZv6DDH3FsKnxfsFuuNIkYGpli1GV4aM mFPQ== 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 w80si14747526oif.103.2019.04.09.03.30.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 03:30:29 -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 DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 62437EB4795704B3854F; Tue, 9 Apr 2019 18:17:36 +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 18:17:26 +0800 From: Chen Zhou To: , , , , , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v3 3/4] arm64: kdump: support more than one crash kernel regions Date: Tue, 9 Apr 2019 18:28:18 +0800 Message-ID: <20190409102819.121335-4-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409102819.121335-1-chenzhou10@huawei.com> References: <20190409102819.121335-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 Signed-off-by: Mike Rapoport --- 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 10:28:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenzhou X-Patchwork-Id: 10890901 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 181071390 for ; Tue, 9 Apr 2019 10:30:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0955228868 for ; Tue, 9 Apr 2019 10:30:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F110E288A6; Tue, 9 Apr 2019 10:30:32 +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 97B2828868 for ; Tue, 9 Apr 2019 10:30:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A44286B0010; Tue, 9 Apr 2019 06:30:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A16E06B0266; Tue, 9 Apr 2019 06:30:29 -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 8DF0A6B0269; Tue, 9 Apr 2019 06:30:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by kanga.kvack.org (Postfix) with ESMTP id 665376B0010 for ; Tue, 9 Apr 2019 06:30:29 -0400 (EDT) Received: by mail-oi1-f200.google.com with SMTP id x125so7188907oix.17 for ; Tue, 09 Apr 2019 03:30:29 -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=XdRPcblfBjER5KlZX0KH02b5VpMLlDEu230VMC1ApB3WzvoMxudbYVfu9RsN0aqw1X GbNpeiOSldNUfccWq8hP1KwbeiXb2jkGesvwTPocmqs2ChhgrobiTM/pPotBYaxZEs2y FKFhX99x17/bW+9jcIxfIYejQ9KaaUZWo1x0cAz8j1s0ByW5RqesIevp8IoDDjvmchgf y/jOwzzaETh0bZBP9pfMyw7HzuY7FGzJ46FeKuLC9eU7b1cs3PmjrQbTTFhDEBeFO+tm LBsNcd20JILtSYScDVJM9RBXCsmhPb+451JN4e0w2BWKSAgtOuAGl1ZKAVDfaJcSnExA kSRw== 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: APjAAAVa5+kMW+QhUEjMUJbmm8SQaEbcTOT0Ucxcb1mRnWcYqRDQJC/C KS3h6Ar7uJp8I7EOBNKrBPJezY0sfkY8lxoPTI/6jVC1UQI73mmk/sczDqk1x7+KmeD2nu3Dyds bzHQRx4HjGpW5qgYaraafIe+kzLSR83pfeyTM89vzdbKCl1WwEYkrYYyxgtlLTb4dUA== X-Received: by 2002:a9d:5e02:: with SMTP id d2mr22360817oti.222.1554805829163; Tue, 09 Apr 2019 03:30:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKgzVTC78ZdurK6nobLXQUcz/rapzkAEtUtVpzLTiYMzmPjZXUkuqOhezk0ZevKi3REnKv X-Received: by 2002:a9d:5e02:: with SMTP id d2mr22360783oti.222.1554805828420; Tue, 09 Apr 2019 03:30:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554805828; cv=none; d=google.com; s=arc-20160816; b=Z4VyMk4uAIhTiMHDYAiG5TixRYW4qTqqSKX9XHdCr0MccLjQ+Afu6iHyjC150FJjFU TaS/HQG3+32vGM6jq1HLGE8e+kXtdCwdJhcrzHxeMf1sFh2ShhlCa/n3Ihoz9iT/m24U +AldtaodoETMVKmwK41skRBMOHwhJ03WcixxiCwKG+O/ypjY/N1jB7TxZvobFPAFrFpg YnZVYorYVzzgPUogBoGjxfDUr3+I4HDX600eEGPmnovyvtX2x7MvbOJ1gSxQttimIqzM ckeiU4ZOImSO87dsB/+bV3AvqkKfy7enQDDzhbABV8U6cq8WysIXDmgQhk5VJUjAsmx/ KTHA== 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=pKxVyjZ3c0uDrFnVrNO2xoAuGhFPAJSYQQwvEV33pkR+/0gg0xdsyF5mVZJooy3Xpk yGgGElsxlhw5LT0oUd1rZCuNHw/OWXr4EulnSQWXRpgiu6AcXeUFGzrph1JCor9dM8al HDAB8kViIIql1KDkU3jn0QQiFB4q+QFY1uRPaejzXtXvcraGnTd2ppi4qjpTarjTuh9q rdDNX1DSGPDislidsDdF3ysXxVN50GUUNdEuSVmt8JONAkcvQ97BinJmb4aQcdwvth73 Hfc891DEhtEZ+0jBv1N1R/uOBYX54SiNR7x9/OYYsO0Tw6p6z7OmOApkV8UZjNbIWB4s rVTQ== 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 o21si14740688otl.216.2019.04.09.03.30.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 03:30:28 -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 DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 6B49190406CAC14DD96D; Tue, 9 Apr 2019 18:17:36 +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 18:17:28 +0800 From: Chen Zhou To: , , , , , , , , CC: , , , , , , , Chen Zhou Subject: [PATCH v3 4/4] kdump: update Documentation about crashkernel on arm64 Date: Tue, 9 Apr 2019 18:28:19 +0800 Message-ID: <20190409102819.121335-5-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409102819.121335-1-chenzhou10@huawei.com> References: <20190409102819.121335-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