linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen Zhou <chenzhou10@huawei.com>
To: <catalin.marinas@arm.com>, <will@kernel.org>,
	<james.morse@arm.com>, <tglx@linutronix.de>, <mingo@redhat.com>,
	<dyoung@redhat.com>, <bhe@redhat.com>, <corbet@lwn.net>,
	<John.P.donnelly@oracle.com>, <prabhakar.pkin@gmail.com>,
	<bhsharma@redhat.com>
Cc: <horms@verge.net.au>, <robh+dt@kernel.org>, <arnd@arndb.de>,
	<nsaenzjulienne@suse.de>, <linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>, <kexec@lists.infradead.org>,
	<linux-doc@vger.kernel.org>, <guohanjun@huawei.com>,
	<xiexiuqi@huawei.com>, <huawei.libin@huawei.com>,
	<wangkefeng.wang@huawei.com>, <chenzhou10@huawei.com>
Subject: [PATCH v12 3/9] x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel[_low]()
Date: Mon, 7 Sep 2020 21:47:39 +0800	[thread overview]
Message-ID: <20200907134745.25732-4-chenzhou10@huawei.com> (raw)
In-Reply-To: <20200907134745.25732-1-chenzhou10@huawei.com>

To make the functions reserve_crashkernel[_low]() as generic,
replace some hard-coded numbers with macro CRASH_ADDR_LOW_MAX.

Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
---
 arch/x86/kernel/setup.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d7fd90c52dae..71a6a6e7ca5b 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -430,7 +430,7 @@ static int __init reserve_crashkernel_low(void)
 	unsigned long total_low_mem;
 	int ret;
 
-	total_low_mem = memblock_mem_size(1UL << (32 - PAGE_SHIFT));
+	total_low_mem = memblock_mem_size(CRASH_ADDR_LOW_MAX >> PAGE_SHIFT);
 
 	/* crashkernel=Y,low */
 	ret = parse_crashkernel_low(boot_command_line, total_low_mem, &low_size, &base);
@@ -451,7 +451,7 @@ static int __init reserve_crashkernel_low(void)
 			return 0;
 	}
 
-	low_base = memblock_find_in_range(CRASH_ALIGN, 1ULL << 32, low_size, CRASH_ALIGN);
+	low_base = memblock_find_in_range(CRASH_ALIGN, CRASH_ADDR_LOW_MAX, 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));
@@ -504,8 +504,9 @@ static void __init reserve_crashkernel(void)
 	if (!crash_base) {
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
-		 * crashkernel=x,high reserves memory over 4G, also allocates
-		 * 256M extra low memory for DMA buffers and swiotlb.
+		 * crashkernel=x,high reserves memory over CRASH_ADDR_LOW_MAX,
+		 * also allocates 256M extra low memory for DMA buffers
+		 * and swiotlb.
 		 * But the extra memory is not required for all machines.
 		 * So try low memory first and fall back to high memory
 		 * unless "crashkernel=size[KMG],high" is specified.
@@ -539,7 +540,7 @@ static void __init reserve_crashkernel(void)
 		return;
 	}
 
-	if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) {
+	if (crash_base >= CRASH_ADDR_LOW_MAX && reserve_crashkernel_low()) {
 		memblock_free(crash_base, crash_size);
 		return;
 	}
-- 
2.20.1


  parent reply	other threads:[~2020-09-07 17:20 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-07 13:47 [PATCH v12 0/9] support reserving crashkernel above 4G on arm64 kdump Chen Zhou
2020-09-07 13:47 ` [PATCH v12 1/9] x86: kdump: move CRASH_ALIGN to 2M Chen Zhou
2020-09-08  1:21   ` Dave Young
2020-09-08  3:19     ` chenzhou
2020-09-07 13:47 ` [PATCH v12 2/9] x86: kdump: make the lower bound of crash kernel reservation consistent Chen Zhou
2020-09-07 13:47 ` Chen Zhou [this message]
2020-09-18  3:01   ` [PATCH v12 3/9] x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel[_low]() Dave Young
2020-09-18  3:57     ` chenzhou
2020-09-18  5:26       ` Dave Young
2020-09-18  7:25   ` Baoquan He
2020-09-18  8:59     ` chenzhou
2020-09-18  9:06       ` chenzhou
2020-10-05 17:20         ` Catalin Marinas
2020-09-07 13:47 ` [PATCH v12 4/9] x86: kdump: move reserve_crashkernel[_low]() into crash_core.c Chen Zhou
2020-09-07 13:47 ` [PATCH v12 5/9] arm64: kdump: introduce some macroes for crash kernel reservation Chen Zhou
2020-09-07 13:47 ` [PATCH v12 6/9] arm64: kdump: reimplement crashkernel=X Chen Zhou
2020-10-05 17:16   ` Catalin Marinas
2020-10-06  1:30     ` chenzhou
2020-09-07 13:47 ` [PATCH v12 7/9] kdump: add threshold for the required memory Chen Zhou
2020-10-05 17:12   ` Catalin Marinas
2020-10-06  1:34     ` chenzhou
2020-09-07 13:47 ` [PATCH v12 8/9] arm64: kdump: add memory for devices by DT property linux,usable-memory-range Chen Zhou
2020-09-07 13:47 ` [PATCH v12 9/9] kdump: update Documentation about crashkernel Chen Zhou
2020-10-05 17:19   ` Catalin Marinas
2020-10-06  2:10     ` chenzhou
2020-10-07 16:24       ` Catalin Marinas
2020-09-12 11:44 ` [PATCH v12 0/9] support reserving crashkernel above 4G on arm64 kdump John Donnelly
2020-10-05 17:09   ` Catalin Marinas
2020-10-05 17:42     ` Bhupesh Sharma
2020-10-06  1:48       ` chenzhou
2020-10-06 18:00       ` Catalin Marinas
2020-10-07  7:07         ` Bhupesh Sharma
2020-10-07 16:33           ` Catalin Marinas
2020-10-19  2:43           ` chenzhou
2020-09-15  7:16 ` chenzhou
2020-09-23 17:47   ` John Donnelly

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200907134745.25732-4-chenzhou10@huawei.com \
    --to=chenzhou10@huawei.com \
    --cc=John.P.donnelly@oracle.com \
    --cc=arnd@arndb.de \
    --cc=bhe@redhat.com \
    --cc=bhsharma@redhat.com \
    --cc=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=dyoung@redhat.com \
    --cc=guohanjun@huawei.com \
    --cc=horms@verge.net.au \
    --cc=huawei.libin@huawei.com \
    --cc=james.morse@arm.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=nsaenzjulienne@suse.de \
    --cc=prabhakar.pkin@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangkefeng.wang@huawei.com \
    --cc=will@kernel.org \
    --cc=xiexiuqi@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).