Skip to contentSkip to conversation

arm64: use generic free_initrd_mem()

PATCH Superseded Mike Rapoport 2 participants 2 messages Sep 24, 2019

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 implementation of free_initrd_mem() on arm64.

---

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

 arch/arm64/mm/init.c | 12 ------------
 init/initramfs.c     |  4 ++++
 2 files changed, 4 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 +4 -0
index c47dad0..403c6a0 100644
@@ -531,6 +531,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(__virt_to_phys(start), end - start);
+#endif
 }
 
 #ifdef CONFIG_KEXEC_CORE
Signature · 1 line
2.7.4
#1 lore raw
I love your patch! Yet something to improve:

Hi Mike,

I love your patch! Yet something to improve:

[auto build test ERROR on arm64/for-next/core]
[cannot apply to v5.3 next-20190920]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Mike-Rapoport/arm64-use-generic-free_initrd_mem/20190924-220328
base:   https://kernel.googlesource.com/pub/scm/linux/kernel/git/arm64/linux.git for-next/core
config: powerpc-allmodconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 7.4.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=powerpc

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

init/initramfs.c: In function 'free_initrd_mem':

>> init/initramfs.c:536:2: error: implicit declaration of function 'memblock_free'; did you mean 'ptlock_free'? [-Werror=implicit-function-declaration]
     memblock_free(__virt_to_phys(start), end - start);
     ^~~~~~~~~~~~~
     ptlock_free
>> init/initramfs.c:536:16: error: implicit declaration of function '__virt_to_phys'; did you mean 'virt_to_phys'? [-Werror=implicit-function-declaration]
     memblock_free(__virt_to_phys(start), end - start);
                   ^~~~~~~~~~~~~~
                   virt_to_phys

cc1: some warnings being treated as errors

vim +536 init/initramfs.c

529
530 void __weak free_initrd_mem(unsigned long start, unsigned long end)
531 {
532 free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
533 "initrd");
534
535 #ifdef CONFIG_ARCH_KEEP_MEMBLOCK

 > 536		memblock_free(__virt_to_phys(start), end - start);

537 #endif
538 }
539

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation