Skip to contentSkip to conversation

arm64: Force NO_BLOCK_MAPPINGS if crashkernel reservation is required

PATCH Applied Catalin Marinas 4 participants 7 messages Nov 19, 2020 – Nov 20, 2020 arm64

lore
Share & tools
lore

Catalin Marinas

author maintainer
#0 lore raw

PATCH 1/1 arm64: Force NO_BLOCK_MAPPINGS if crashkernel reservation is required

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Cc James Morse <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>

---

Following the online (and offline) discussion with James and Nicolas, this aims to avoid issues with moving the reserve_crashkernel() call to after the memory map has been created (the ZONE_DMA patches).

https://lore.kernel.org/r/[email protected]

 arch/arm64/mm/mmu.c | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
arch/arm64/mm/mmu.c +16 -21
index d7fe72ee678a..dd214157a026 100644
@@ -469,6 +469,21 @@ void __init mark_linear_text_alias_ro(void)
 			    PAGE_KERNEL_RO);
 }
 
+static bool crash_mem_map __initdata;
+
+static int __init enable_crash_mem_map(char *arg)
+{
+	/*
+	 * Proper parameter parsing is done by reserve_crashkernel(). We only
+	 * need to know if the linear map has to avoid block mappings so that
+	 * the crashkernel reservations can be unmapped later.
+	 */
+	crash_mem_map = true;
+
+	return 0;
+}
+early_param("crashkernel", enable_crash_mem_map);
+
 static void __init map_mem(pgd_t *pgdp)
 {
 	phys_addr_t kernel_start = __pa_symbol(_stext);
@@ -477,7 +492,7 @@ static void __init map_mem(pgd_t *pgdp)
 	int flags = 0;
 	u64 i;
 
-	if (rodata_full || debug_pagealloc_enabled())
+	if (rodata_full || crash_mem_map || debug_pagealloc_enabled())
 		flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
 
 	/*
@@ -487,11 +502,6 @@ static void __init map_mem(pgd_t *pgdp)
 	 * the following for-loop
 	 */
 	memblock_mark_nomap(kernel_start, kernel_end - kernel_start);
-#ifdef CONFIG_KEXEC_CORE
-	if (crashk_res.end)
-		memblock_mark_nomap(crashk_res.start,
-				    resource_size(&crashk_res));
-#endif
 
 	/* map all the memory banks */
 	for_each_mem_range(i, &start, &end) {
@@ -518,21 +528,6 @@ static void __init map_mem(pgd_t *pgdp)
 	__map_memblock(pgdp, kernel_start, kernel_end,
 		       PAGE_KERNEL, NO_CONT_MAPPINGS);
 	memblock_clear_nomap(kernel_start, kernel_end - kernel_start);
-
-#ifdef CONFIG_KEXEC_CORE
-	/*
-	 * Use page-level mappings here so that we can shrink the region
-	 * in page granularity and put back unused memory to buddy system
-	 * through /sys/kernel/kexec_crash_size interface.
-	 */
-	if (crashk_res.end) {
-		__map_memblock(pgdp, crashk_res.start, crashk_res.end + 1,
-			       PAGE_KERNEL,
-			       NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS);
-		memblock_clear_nomap(crashk_res.start,
-				     resource_size(&crashk_res));
-	}
-#endif
 }
 
 void mark_rodata_ro(void)

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Acked-by on v1 1/1
#1 lore raw

Hi Catalin, Nicolas,

Quoted 6 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Looks good to me!

Thanks,

James

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Reviewed-by Tested-by on v1 1/1
#2 lore raw
In reply to Catalin Marinas
Quoted 11 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Cc James Morse <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>

---

On RPi4:

Regards,
Nicolas

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw
In reply to Catalin Marinas
Quoted 33 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Cc James Morse <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>

---

Following the online (and offline) discussion with James and Nicolas, this aims to avoid issues with moving the reserve_crashkernel() call to after the memory map has been created (the ZONE_DMA patches).

https://lore.kernel.org/r/[email protected]

 arch/arm64/mm/mmu.c | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
arch/arm64/mm/mmu.c +4 -0
index d7fe72ee678a..dd214157a026 100644
@@ -469,6 +469,21 @@ void __init mark_linear_text_alias_ro(void)
 			    PAGE_KERNEL_RO);
 }
 
+static bool crash_mem_map __initdata;
+
+static int __init enable_crash_mem_map(char *arg)
+{

arch/arm64/mm/mmu.c void __init mark_linear_text_alias_ro(void) · line 485

Quoted 10 lines
arch/arm64/mm/mmu.c +10 -0
+	/*
+	 * Proper parameter parsing is done by reserve_crashkernel(). We only
+	 * need to know if the linear map has to avoid block mappings so that
+	 * the crashkernel reservations can be unmapped later.
+	 */
+	crash_mem_map = true;
+
+	return 0;
+}
+early_param("crashkernel", enable_crash_mem_map);

Should not the crash kernel cmdline parameter gets parsed enough, just to ensure it is atleast a valid one ? Otherwise an invalid cmdline request can prevent the block mapping. In that case, the kernel will neither have a crash kernel nor the block mapping.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#4 lore raw
Quoted 41 lines · Anshuman Khandual
Quoted 40 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Cc James Morse <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>

---

Following the online (and offline) discussion with James and Nicolas, this aims to avoid issues with moving the reserve_crashkernel() call to after the memory map has been created (the ZONE_DMA patches).

https://lore.kernel.org/r/[email protected]

 arch/arm64/mm/mmu.c | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
arch/arm64/mm/mmu.c +11 -0
index d7fe72ee678a..dd214157a026 100644
@@ -469,6 +469,21 @@ void __init mark_linear_text_alias_ro(void)
 			    PAGE_KERNEL_RO);
 }
 
+static bool crash_mem_map __initdata;
+
+static int __init enable_crash_mem_map(char *arg)
+{
+	/*
+	 * Proper parameter parsing is done by reserve_crashkernel(). We only
+	 * need to know if the linear map has to avoid block mappings so that
+	 * the crashkernel reservations can be unmapped later.
+	 */
+	crash_mem_map = true;
+
Quoted 8 lines

arch/arm64/mm/mmu.c void __init mark_linear_text_alias_ro(void) · line 485

Quoted 3 lines
arch/arm64/mm/mmu.c +3 -0
+	return 0;
+}
+early_param("crashkernel", enable_crash_mem_map);

Should not the crash kernel cmdline parameter gets parsed enough, just to ensure it is atleast a valid one ? Otherwise an invalid cmdline request can prevent the block mapping. In that case, the kernel will neither have a crash kernel nor the block mapping.

Does it actually matter? If people pass random strings on the command line, they should expect some side-effects. That's about the intention to have a crashkernel. We can't fully validate the crashkernel parameter until we know the zones layout.

Also note that with defconfig, we don't get block mappings anyway (rodata_full).

Signature · 6 lines
Catalin

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#5 lore raw
Quoted 51 lines · Catalin Marinas
Quoted 41 lines · Anshuman Khandual
Quoted 40 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Cc James Morse <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>

---

Following the online (and offline) discussion with James and Nicolas, this aims to avoid issues with moving the reserve_crashkernel() call to after the memory map has been created (the ZONE_DMA patches).

https://lore.kernel.org/r/[email protected]

 arch/arm64/mm/mmu.c | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
arch/arm64/mm/mmu.c +11 -0
index d7fe72ee678a..dd214157a026 100644
@@ -469,6 +469,21 @@ void __init mark_linear_text_alias_ro(void)
 			    PAGE_KERNEL_RO);
 }
 
+static bool crash_mem_map __initdata;
+
+static int __init enable_crash_mem_map(char *arg)
+{
+	/*
+	 * Proper parameter parsing is done by reserve_crashkernel(). We only
+	 * need to know if the linear map has to avoid block mappings so that
+	 * the crashkernel reservations can be unmapped later.
+	 */
+	crash_mem_map = true;
+
Quoted 8 lines

arch/arm64/mm/mmu.c void __init mark_linear_text_alias_ro(void) · line 485

Quoted 3 lines
arch/arm64/mm/mmu.c +3 -0
+	return 0;
+}
+early_param("crashkernel", enable_crash_mem_map);

Should not the crash kernel cmdline parameter gets parsed enough, just to ensure it is atleast a valid one ? Otherwise an invalid cmdline request can prevent the block mapping. In that case, the kernel will neither have a crash kernel nor the block mapping.

Quoted 4 lines

Does it actually matter? If people pass random strings on the command line, they should expect some side-effects. That's about the intention to have a crashkernel. We can't fully validate the crashkernel parameter until we know the zones layout.

Makes sense.

Quoted 4 lines

Also note that with defconfig, we don't get block mappings anyway (rodata_full).

Sure, seems alight then.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer Applied
#6 lore raw
In reply to Catalin Marinas
Quoted 6 lines · Catalin Marinas

mem_init() currently relies on knowing the boundaries of the crashkernel reservation to map such region with page granularity for later unmapping via set_memory_valid(..., 0). If the crashkernel reservation is deferred, such boundaries are not known when the linear mapping is created. Simply parse the command line for "crashkernel" and, if found, create the linear map with NO_BLOCK_MAPPINGS.

Applied to arm64 (for-next/zone-dma-default-32-bit), thanks for the review/test!

[1/1] arm64: Force NO_BLOCK_MAPPINGS if crashkernel reservation is required

      https://git.kernel.org/arm64/c/2687275a5843
Signature · 7 lines
Catalin


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel