public inbox for devicetree@vger.kernel.org
 help / color / mirror / Atom feed
From: Zhen Lei <thunder.leizhen@huawei.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	<x86@kernel.org>, "H . Peter Anvin" <hpa@zytor.com>,
	<linux-kernel@vger.kernel.org>, Dave Young <dyoung@redhat.com>,
	Baoquan He <bhe@redhat.com>, Vivek Goyal <vgoyal@redhat.com>,
	Eric Biederman <ebiederm@xmission.com>,
	<kexec@lists.infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	"Will Deacon" <will@kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Rob Herring <robh+dt@kernel.org>,
	Frank Rowand <frowand.list@gmail.com>,
	<devicetree@vger.kernel.org>, Jonathan Corbet <corbet@lwn.net>,
	<linux-doc@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>,
	Randy Dunlap <rdunlap@infradead.org>,
	Feng Zhou <zhoufeng.zf@bytedance.com>,
	Kefeng Wang <wangkefeng.wang@huawei.com>,
	Chen Zhou <dingguo.cz@antgroup.com>,
	"John Donnelly" <John.p.donnelly@oracle.com>
Subject: [PATCH v18 06/17] x86/setup: Update comments in reserve_crashkernel()
Date: Wed, 22 Dec 2021 21:08:09 +0800	[thread overview]
Message-ID: <20211222130820.1754-7-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20211222130820.1754-1-thunder.leizhen@huawei.com>

Add comments to describe which bootup parameters are processed by the
code, and make comments close to the code being commented.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
 arch/x86/kernel/setup.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 07a58313db5c5f7..52aa925877ca787 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -485,20 +485,20 @@ static void __init reserve_crashkernel(void)
 	if (flag == CRASHKERNEL_MEM_NONE)
 		return;
 
-	/* 0 means: find the address automatically */
 	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.
-		 * 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.
+		 * For the case of crashkernel=X[@offset] and offset is omitted,
+		 * try the low memory first.
 		 */
 		if (!(flag & CRASHKERNEL_MEM_HIGH))
 			crash_base = memblock_phys_alloc_range(crash_size,
 						CRASH_ALIGN, CRASH_ALIGN,
 						CRASH_ADDR_LOW_MAX);
+
+		/*
+		 * If low memory allocation failed above, or for the case of
+		 * crashkernel=X,high, try the high memory.
+		 */
 		if (!crash_base)
 			crash_base = memblock_phys_alloc_range(crash_size,
 						CRASH_ALIGN, CRASH_ALIGN,
@@ -510,6 +510,10 @@ static void __init reserve_crashkernel(void)
 	} else {
 		unsigned long long start;
 
+		/*
+		 * The case of crashkernel=X@offset and offset is specified.
+		 * Only user-specified space can be reserved.
+		 */
 		start = memblock_phys_alloc_range(crash_size, SZ_1M, crash_base,
 						  crash_base + crash_size);
 		if (start != crash_base) {
@@ -520,6 +524,10 @@ static void __init reserve_crashkernel(void)
 
 #ifdef CONFIG_X86_64
 	if (crash_base >= (1ULL << 32)) {
+		/*
+		 * Ensure that at least 256M extra low memory is allocated for
+		 * DMA buffers and swiotlb, if low memory size is not specified.
+		 */
 		if (!(flag & CRASHKERNEL_MEM_LOW)) {
 			/*
 			 * two parts from kernel/dma/swiotlb.c:
-- 
2.25.1


  parent reply	other threads:[~2021-12-22 13:12 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-22 13:08 [PATCH v18 00/17] support reserving crashkernel above 4G on arm64 kdump Zhen Lei
2021-12-22 13:08 ` [PATCH v18 01/17] x86/setup: Move CRASH_ALIGN and CRASH_ADDR_{LOW|HIGH}_MAX to asm/kexec.h Zhen Lei
2021-12-22 20:43   ` Borislav Petkov
2021-12-23  2:09     ` Leizhen (ThunderTown)
2021-12-22 13:08 ` [PATCH v18 02/17] x86/setup: Move xen_pv_domain() check and insert_resource() to setup_arch() Zhen Lei
2021-12-23 17:26   ` Borislav Petkov
2021-12-24  6:36     ` Leizhen (ThunderTown)
2021-12-25  1:53       ` Leizhen (ThunderTown)
2021-12-25 10:16         ` Leizhen (ThunderTown)
2022-01-07  8:13         ` Leizhen (ThunderTown)
2022-01-07 13:09           ` Leizhen (ThunderTown)
2021-12-22 13:08 ` [PATCH v18 03/17] x86/setup: Adjust the range of codes separated by CONFIG_X86_64 Zhen Lei
2021-12-22 13:08 ` [PATCH v18 04/17] x86/setup: Add helper parse_crashkernel_in_order() Zhen Lei
2021-12-25  1:58   ` Leizhen (ThunderTown)
2021-12-22 13:08 ` [PATCH v18 05/17] x86/setup: Use parse_crashkernel_in_order() to make code logic clear Zhen Lei
2021-12-22 13:08 ` Zhen Lei [this message]
2021-12-22 13:08 ` [PATCH v18 07/17] x86/setup: Eliminate a magic number in reserve_crashkernel() Zhen Lei
2021-12-22 13:08 ` [PATCH v18 08/17] x86/setup: Add build option ARCH_WANT_RESERVE_CRASH_KERNEL Zhen Lei
2021-12-22 13:08 ` [PATCH v18 09/17] x86/setup: Move reserve_crashkernel[_low]() into crash_core.c Zhen Lei
2021-12-22 13:08 ` [PATCH v18 10/17] kdump: Simplify the parameters of __parse_crashkernel() Zhen Lei
2021-12-22 13:08 ` [PATCH v18 11/17] kdump: Make parse_crashkernel_{high|low} static Zhen Lei
2021-12-22 13:08 ` [PATCH v18 12/17] kdump: Reduce unused parameters of parse_crashkernel_{high|low} Zhen Lei
2021-12-22 13:08 ` [PATCH v18 13/17] arm64: kdump: introduce some macros for crash kernel reservation Zhen Lei
2021-12-22 13:08 ` [PATCH v18 14/17] arm64: kdump: reimplement crashkernel=X Zhen Lei
2021-12-22 13:08 ` [PATCH v18 15/17] of: fdt: Aggregate the processing of "linux,usable-memory-range" Zhen Lei
2021-12-23 15:48   ` Dave Kleikamp
2021-12-24  1:03     ` Leizhen (ThunderTown)
2021-12-22 13:08 ` [PATCH v18 16/17] of: fdt: Add memory for devices by DT property "linux,usable-memory-range" Zhen Lei
2021-12-22 13:08 ` [PATCH v18 17/17] kdump: update Documentation about crashkernel Zhen Lei

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=20211222130820.1754-7-thunder.leizhen@huawei.com \
    --to=thunder.leizhen@huawei.com \
    --cc=John.p.donnelly@oracle.com \
    --cc=bhe@redhat.com \
    --cc=bp@alien8.de \
    --cc=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=dingguo.cz@antgroup.com \
    --cc=dyoung@redhat.com \
    --cc=ebiederm@xmission.com \
    --cc=frowand.list@gmail.com \
    --cc=hpa@zytor.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=rdunlap@infradead.org \
    --cc=robh+dt@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=vgoyal@redhat.com \
    --cc=wangkefeng.wang@huawei.com \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    --cc=zhoufeng.zf@bytedance.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