Thread (66 messages) 66 messages, 8 authors, 2021-12-21

Re: [PATCH v17 03/10] x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel()

flat view

From: <hidden>
Date: 2021-12-13 14:29:30
Also in: kexec, linux-arm-kernel, linux-devicetree, lkml

On 12/10/21 12:55 AM, Zhen Lei wrote:
From: Chen Zhou <redacted>

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

Signed-off-by: Chen Zhou <redacted>
Signed-off-by: Zhen Lei <redacted>
Tested-by: John Donnelly <redacted>
Tested-by: Dave Kleikamp <redacted>
Acked-by: Baoquan He <redacted>
 Acked-by: John Donnelly [off-list ref]
quoted hunk ↗ jump to hunk
---
  arch/x86/kernel/setup.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6424ee4f23da2cf..bb2a0973b98059e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -489,8 +489,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.
@@ -518,7 +519,7 @@ static void __init reserve_crashkernel(void)
  		}
  	}
  
-	if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) {
+	if (crash_base >= CRASH_ADDR_LOW_MAX && reserve_crashkernel_low()) {
  		memblock_phys_free(crash_base, crash_size);
  		return;
  	}
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help