Skip to contentSkip to conversation

arm64: use generic free_initrd_mem()

PATCH Superseded Mike Rapoport 2 participants 3 messages Sep 25, 2019 – Sep 28, 2019

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: use generic free_initrd_mem()

From: Mike Rapoport <[email protected]>

arm64 calls memblock_free() for the initrd area in its implementation of free_initrd_mem(), but this call has no actual effect that late in the boot process. By the time initrd is freed, all the reserved memory is managed by the page allocator and the memblock.reserved is unused, so the only purpose of the memblock_free() call is to keep track of initrd memory for debugging and accounting.

Without the memblock_free() call the only difference between arm64 and the generic versions of free_initrd_mem() is the memory poisoning.

Move memblock_free() call to the generic code, enable it there for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic implementaion of free_initrd_mem() on arm64.

---

v3:
* fix powerpc build

v2:
* add memblock_free() to the generic free_initrd_mem()
* rebase on the current upstream

 arch/arm64/mm/init.c | 12 ------------
 init/initramfs.c     |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
arch/arm64/mm/init.c +0 -12
index 45c00a5..87a0e3b 100644
@@ -580,18 +580,6 @@ void free_initmem(void)
 	unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
-	unsigned long aligned_start, aligned_end;
-
-	aligned_start = __virt_to_phys(start) & PAGE_MASK;
-	aligned_end = PAGE_ALIGN(__virt_to_phys(end));
-	memblock_free(aligned_start, aligned_end - aligned_start);
-	free_reserved_area((void *)start, (void *)end, 0, "initrd");
-}
-#endif
-
 /*
  * Dump out memory limit information on panic.
  */
init/initramfs.c +5 -0
index c47dad0..3d61e13 100644
@@ -10,6 +10,7 @@
 #include <linux/syscalls.h>
 #include <linux/utime.h>
 #include <linux/file.h>
+#include <linux/memblock.h>
 
 static ssize_t __init xwrite(int fd, const char *p, size_t count)
 {
@@ -531,6 +532,10 @@ void __weak free_initrd_mem(unsigned long start, unsigned long end)
 {
 	free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
 			"initrd");
+
+#ifdef CONFIG_ARCH_KEEP_MEMBLOCK
+	memblock_free(__pa(start), end - start);
+#endif
 }
 
 #ifdef CONFIG_KEXEC_CORE
Signature · 1 line
2.7.4
#1 lore raw
Quoted 9 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

arm64 calls memblock_free() for the initrd area in its implementation of free_initrd_mem(), but this call has no actual effect that late in the boot process. By the time initrd is freed, all the reserved memory is managed by the page allocator and the memblock.reserved is unused, so the only purpose of the memblock_free() call is to keep track of initrd memory for debugging and accounting.

Quoted 6 lines

Without the memblock_free() call the only difference between arm64 and the generic versions of free_initrd_mem() is the memory poisoning.

Move memblock_free() call to the generic code, enable it there for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic implementaion of free_initrd_mem() on arm64.

Small nit. s/implementaion/implementation.

Quoted 52 lines

---

v3:
* fix powerpc build

v2:
* add memblock_free() to the generic free_initrd_mem()
* rebase on the current upstream

 arch/arm64/mm/init.c | 12 ------------
 init/initramfs.c     |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
arch/arm64/mm/init.c +0 -12
index 45c00a5..87a0e3b 100644
@@ -580,18 +580,6 @@ void free_initmem(void)
 	unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
-	unsigned long aligned_start, aligned_end;
-
-	aligned_start = __virt_to_phys(start) & PAGE_MASK;
-	aligned_end = PAGE_ALIGN(__virt_to_phys(end));
-	memblock_free(aligned_start, aligned_end - aligned_start);
-	free_reserved_area((void *)start, (void *)end, 0, "initrd");
-}
-#endif
-
 /*
  * Dump out memory limit information on panic.
  */
init/initramfs.c +1 -0
index c47dad0..3d61e13 100644
@@ -10,6 +10,7 @@
 #include <linux/syscalls.h>
 #include <linux/utime.h>
 #include <linux/file.h>
+#include <linux/memblock.h>
 
 static ssize_t __init xwrite(int fd, const char *p, size_t count)
 {

init/initramfs.c void __weak free_initrd_mem(unsigned long start, unsigned long end) · line 536

Quoted 5 lines
init/initramfs.c +2 -0
@@ -531,6 +532,10 @@ void __weak free_initrd_mem(unsigned long start, unsigned long end)
 {
 	free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
 			"initrd");
+
+#ifdef CONFIG_ARCH_KEEP_MEMBLOCK

Should not the addresses here be aligned first before calling memblock_free() ? Without alignment, it breaks present behavior on arm64 which was explicitly added with 13776f9d40a0 ("arm64: mm: free the initrd reserved memblock in a aligned manner"). Or does initrd always gets allocated with page alignment on other architectures.

Quoted 6 lines
init/initramfs.c +2 -0
+	memblock_free(__pa(start), end - start);
+#endif
 }
 
 #ifdef CONFIG_KEXEC_CORE
#2 lore raw
Quoted 69 lines · Anshuman Khandual
Quoted 9 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

arm64 calls memblock_free() for the initrd area in its implementation of free_initrd_mem(), but this call has no actual effect that late in the boot process. By the time initrd is freed, all the reserved memory is managed by the page allocator and the memblock.reserved is unused, so the only purpose of the memblock_free() call is to keep track of initrd memory for debugging and accounting.

Quoted 6 lines

Without the memblock_free() call the only difference between arm64 and the generic versions of free_initrd_mem() is the memory poisoning.

Move memblock_free() call to the generic code, enable it there for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic implementaion of free_initrd_mem() on arm64.

Small nit. s/implementaion/implementation.

Quoted 49 lines

---

v3:
* fix powerpc build

v2:
* add memblock_free() to the generic free_initrd_mem()
* rebase on the current upstream

 arch/arm64/mm/init.c | 12 ------------
 init/initramfs.c     |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
arch/arm64/mm/init.c +0 -12
index 45c00a5..87a0e3b 100644
@@ -580,18 +580,6 @@ void free_initmem(void)
 	unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
-	unsigned long aligned_start, aligned_end;
-
-	aligned_start = __virt_to_phys(start) & PAGE_MASK;
-	aligned_end = PAGE_ALIGN(__virt_to_phys(end));
-	memblock_free(aligned_start, aligned_end - aligned_start);
-	free_reserved_area((void *)start, (void *)end, 0, "initrd");
-}
-#endif
-
 /*
  * Dump out memory limit information on panic.
  */
init/initramfs.c +1 -0
index c47dad0..3d61e13 100644
@@ -10,6 +10,7 @@
 #include <linux/syscalls.h>
 #include <linux/utime.h>
 #include <linux/file.h>
+#include <linux/memblock.h>
 
Quoted 12 lines

init/initramfs.c void __weak free_initrd_mem(unsigned long start, unsigned long end) · line 536

Quoted 8 lines
init/initramfs.c +2 -0
 static ssize_t __init xwrite(int fd, const char *p, size_t count)
 {
@@ -531,6 +532,10 @@ void __weak free_initrd_mem(unsigned long start, unsigned long end)
 {
 	free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
 			"initrd");
+
+#ifdef CONFIG_ARCH_KEEP_MEMBLOCK

Should not the addresses here be aligned first before calling memblock_free() ? Without alignment, it breaks present behavior on arm64 which was explicitly added with 13776f9d40a0 ("arm64: mm: free the initrd reserved memblock in a aligned manner").

Well, the present behaviour as of v5.3[.1] is call memblock_free() for the unaligned initrd area. The commit 13776f9d40a0 ("arm64: mm: free the initrd reserved memblock in a aligned manner") indeed would fix the reporting in /sys/fs/memblock/reserved, but it won't change anything beyond that despite its commit log implies otherwise.

Quoted 1 line

Or does initrd always gets allocated with page alignment on other architectures.

powerpc reserves aligned area and s390 does not. Other architectures do not keep memblock after init.

I'll re-send with the aligned addresses.

Quoted 6 lines
Quoted 6 lines
init/initramfs.c +2 -0
+	memblock_free(__pa(start), end - start);
+#endif
 }
 
 #ifdef CONFIG_KEXEC_CORE
Signature · 2 lines
Sincerely yours,
Mike.