[PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Kefeng Wang]

Use the same implementation of initrd reserve to avoid duplication.

v3:
- split into four patches, suggested-by Palmer Dabbelt
v2:
- fix build error found by kernel test robot

Kefeng Wang (4):
  initrd: Add the preprocessor guard in initrd.h
  initramfs: Provide a common initrd reserve function
  ARM: Covert to reserve_initrd_mem()
  riscv: Covert to reserve_initrd_mem()

 arch/arm/mm/init.c     | 43 +--------------------------------
 arch/riscv/mm/init.c   | 54 +-----------------------------------------
 include/linux/initrd.h | 11 +++++++++
 init/initramfs.c       | 45 +++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 95 deletions(-)

-- 
2.26.2

[PATCH v3 1/4] initrd: Add the preprocessor guard in initrd.h

[Kefeng Wang]

Add the preprocessor guard in initrd.h to prevent possible
build error from the multiple inclusion of same header file
multiple time.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 include/linux/initrd.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index 8db6f8c8030b..fc30ac30e10e 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
+#ifndef __LINUX_INITRD_H
+#define __LINUX_INITRD_H
+
 #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
 
 /* starting block # of image */
@@ -24,3 +27,5 @@ extern char __initramfs_start[];
 extern unsigned long __initramfs_size;
 
 void console_on_rootfs(void);
+
+#endif /* __LINUX_INITRD_H */
-- 
2.26.2

[PATCH v3 2/4] initramfs: Provide a common initrd reserve function

[Kefeng Wang]

Some architectures(eg, ARM and riscv) have similar logic to
check and reserve the memory of initrd, let's provide a common
function reserve_initrd_mem() to reduce duplicated code.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 include/linux/initrd.h |  6 ++++++
 init/initramfs.c       | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index fc30ac30e10e..85c15717af34 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -18,6 +18,12 @@ extern int initrd_below_start_ok;
 extern unsigned long initrd_start, initrd_end;
 extern void free_initrd_mem(unsigned long, unsigned long);
 
+#ifdef CONFIG_BLK_DEV_INITRD
+extern void __init reserve_initrd_mem(void);
+#else
+static inline void __init reserve_initrd_mem(void) {}
+#endif
+
 extern phys_addr_t phys_initrd_start;
 extern unsigned long phys_initrd_size;
 
diff --git a/init/initramfs.c b/init/initramfs.c
index 55b74d7e5260..f75c89e9d602 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -535,6 +535,51 @@ extern unsigned long __initramfs_size;
 #include <linux/initrd.h>
 #include <linux/kexec.h>
 
+void __init reserve_initrd_mem(void)
+{
+	phys_addr_t start;
+	unsigned long size;
+
+	/* Ignore the virtul address computed during device tree parsing */
+	initrd_start = initrd_end = 0;
+
+	if (!phys_initrd_size)
+		return;
+	/*
+	 * Round the memory region to page boundaries as per free_initrd_mem()
+	 * This allows us to detect whether the pages overlapping the initrd
+	 * are in use, but more importantly, reserves the entire set of pages
+	 * as we don't want these pages allocated for other purposes.
+	 */
+	start = round_down(phys_initrd_start, PAGE_SIZE);
+	size = phys_initrd_size + (phys_initrd_start - start);
+	size = round_up(size, PAGE_SIZE);
+
+	if (!memblock_is_region_memory(start, size)) {
+		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region",
+		       (u64)start, size);
+		goto disable;
+	}
+
+	if (memblock_is_region_reserved(start, size)) {
+		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region\n",
+		       (u64)start, size);
+		goto disable;
+	}
+
+	memblock_reserve(start, size);
+	/* Now convert initrd to virtual addresses */
+	initrd_start = (unsigned long)__va(phys_initrd_start);
+	initrd_end = initrd_start + phys_initrd_size;
+	initrd_below_start_ok = 1;
+
+	return;
+disable:
+	pr_cont(" - disabling initrd\n");
+	initrd_start = 0;
+	initrd_end = 0;
+}
+
 void __weak __init free_initrd_mem(unsigned long start, unsigned long end)
 {
 #ifdef CONFIG_ARCH_KEEP_MEMBLOCK
-- 
2.26.2

[PATCH v3 3/4] ARM: Covert to reserve_initrd_mem()

[Kefeng Wang]

Covert to the generic reserve_initrd_mem() function.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 arch/arm/mm/init.c | 43 +------------------------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..a29e14cd626c 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -153,47 +153,6 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
 	return phys;
 }
 
-static void __init arm_initrd_init(void)
-{
-#ifdef CONFIG_BLK_DEV_INITRD
-	phys_addr_t start;
-	unsigned long size;
-
-	initrd_start = initrd_end = 0;
-
-	if (!phys_initrd_size)
-		return;
-
-	/*
-	 * Round the memory region to page boundaries as per free_initrd_mem()
-	 * This allows us to detect whether the pages overlapping the initrd
-	 * are in use, but more importantly, reserves the entire set of pages
-	 * as we don't want these pages allocated for other purposes.
-	 */
-	start = round_down(phys_initrd_start, PAGE_SIZE);
-	size = phys_initrd_size + (phys_initrd_start - start);
-	size = round_up(size, PAGE_SIZE);
-
-	if (!memblock_is_region_memory(start, size)) {
-		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",
-		       (u64)start, size);
-		return;
-	}
-
-	if (memblock_is_region_reserved(start, size)) {
-		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",
-		       (u64)start, size);
-		return;
-	}
-
-	memblock_reserve(start, size);
-
-	/* Now convert initrd to virtual addresses */
-	initrd_start = __phys_to_virt(phys_initrd_start);
-	initrd_end = initrd_start + phys_initrd_size;
-#endif
-}
-
 #ifdef CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND
 void check_cpu_icache_size(int cpuid)
 {
@@ -215,7 +174,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
 	/* Register the kernel text, kernel data and initrd with memblock. */
 	memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);
 
-	arm_initrd_init();
+	reserve_initrd_mem();
 
 	arm_mm_memblock_reserve();
 
-- 
2.26.2

Re: [PATCH v3 3/4] ARM: Covert to reserve_initrd_mem()

[Kefeng Wang]

update Russell's mail address.


On 2021/1/15 13:46, Kefeng Wang wrote:
> Covert to the generic reserve_initrd_mem() function.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>   arch/arm/mm/init.c | 43 +------------------------------------------
>   1 file changed, 1 insertion(+), 42 deletions(-)
>
> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> index 828a2561b229..a29e14cd626c 100644
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@ -153,47 +153,6 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
>   	return phys;
>   }
>   
> -static void __init arm_initrd_init(void)
> -{
> -#ifdef CONFIG_BLK_DEV_INITRD
> -	phys_addr_t start;
> -	unsigned long size;
> -
> -	initrd_start = initrd_end = 0;
> -
> -	if (!phys_initrd_size)
> -		return;
> -
> -	/*
> -	 * Round the memory region to page boundaries as per free_initrd_mem()
> -	 * This allows us to detect whether the pages overlapping the initrd
> -	 * are in use, but more importantly, reserves the entire set of pages
> -	 * as we don't want these pages allocated for other purposes.
> -	 */
> -	start = round_down(phys_initrd_start, PAGE_SIZE);
> -	size = phys_initrd_size + (phys_initrd_start - start);
> -	size = round_up(size, PAGE_SIZE);
> -
> -	if (!memblock_is_region_memory(start, size)) {
> -		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",
> -		       (u64)start, size);
> -		return;
> -	}
> -
> -	if (memblock_is_region_reserved(start, size)) {
> -		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",
> -		       (u64)start, size);
> -		return;
> -	}
> -
> -	memblock_reserve(start, size);
> -
> -	/* Now convert initrd to virtual addresses */
> -	initrd_start = __phys_to_virt(phys_initrd_start);
> -	initrd_end = initrd_start + phys_initrd_size;
> -#endif
> -}
> -
>   #ifdef CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND
>   void check_cpu_icache_size(int cpuid)
>   {
> @@ -215,7 +174,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
>   	/* Register the kernel text, kernel data and initrd with memblock. */
>   	memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);
>   
> -	arm_initrd_init();
> +	reserve_initrd_mem();
>   
>   	arm_mm_memblock_reserve();
>   

[PATCH v3 4/4] riscv: Covert to reserve_initrd_mem()

[Kefeng Wang]

Covert to the generic reserve_initrd_mem() function.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 arch/riscv/mm/init.c | 54 +-------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index bf5379135e39..1eaae54c8ea1 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -105,55 +105,6 @@ void __init mem_init(void)
 	print_vm_layout();
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-static void __init setup_initrd(void)
-{
-	phys_addr_t start;
-	unsigned long size;
-
-	/* Ignore the virtul address computed during device tree parsing */
-	initrd_start = initrd_end = 0;
-
-	if (!phys_initrd_size)
-		return;
-	/*
-	 * Round the memory region to page boundaries as per free_initrd_mem()
-	 * This allows us to detect whether the pages overlapping the initrd
-	 * are in use, but more importantly, reserves the entire set of pages
-	 * as we don't want these pages allocated for other purposes.
-	 */
-	start = round_down(phys_initrd_start, PAGE_SIZE);
-	size = phys_initrd_size + (phys_initrd_start - start);
-	size = round_up(size, PAGE_SIZE);
-
-	if (!memblock_is_region_memory(start, size)) {
-		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region",
-		       (u64)start, size);
-		goto disable;
-	}
-
-	if (memblock_is_region_reserved(start, size)) {
-		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region\n",
-		       (u64)start, size);
-		goto disable;
-	}
-
-	memblock_reserve(start, size);
-	/* Now convert initrd to virtual addresses */
-	initrd_start = (unsigned long)__va(phys_initrd_start);
-	initrd_end = initrd_start + phys_initrd_size;
-	initrd_below_start_ok = 1;
-
-	pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n",
-		(void *)(initrd_start), size);
-	return;
-disable:
-	pr_cont(" - disabling initrd\n");
-	initrd_start = 0;
-	initrd_end = 0;
-}
-#endif /* CONFIG_BLK_DEV_INITRD */
-
 void __init setup_bootmem(void)
 {
 	phys_addr_t mem_start = 0;
@@ -186,10 +137,7 @@ void __init setup_bootmem(void)
 	dma32_phys_limit = min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn));
 	set_max_mapnr(max_low_pfn);
 
-#ifdef CONFIG_BLK_DEV_INITRD
-	setup_initrd();
-#endif /* CONFIG_BLK_DEV_INITRD */
-
+	reserve_initrd_mem();
 	/*
 	 * Avoid using early_init_fdt_reserve_self() since __pa() does
 	 * not work for DTB pointers that are fixmap addresses
-- 
2.26.2

Re: [PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Kefeng Wang]

Correct Russell's mail address (from linux@armlinux.org.uk to 
rmk+kernel@armlinux.org.uk, should update the MAINTAINERS)

On 2021/1/15 13:46, Kefeng Wang wrote:
> Use the same implementation of initrd reserve to avoid duplication.
>
> v3:
> - split into four patches, suggested-by Palmer Dabbelt
> v2:
> - fix build error found by kernel test robot
>
> Kefeng Wang (4):
>    initrd: Add the preprocessor guard in initrd.h
>    initramfs: Provide a common initrd reserve function
>    ARM: Covert to reserve_initrd_mem()
>    riscv: Covert to reserve_initrd_mem()
>
>   arch/arm/mm/init.c     | 43 +--------------------------------
>   arch/riscv/mm/init.c   | 54 +-----------------------------------------
>   include/linux/initrd.h | 11 +++++++++
>   init/initramfs.c       | 45 +++++++++++++++++++++++++++++++++++
>   4 files changed, 58 insertions(+), 95 deletions(-)
>

Re: [PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Russell King - ARM Linux admin]

On Sun, Jan 17, 2021 at 12:57:55PM +0800, Kefeng Wang wrote:
> Correct Russell's mail address (from linux@armlinux.org.uk to
> rmk+kernel@armlinux.org.uk, should update the MAINTAINERS)

No. MAINTAINERS is correct.

> On 2021/1/15 13:46, Kefeng Wang wrote:
> > Use the same implementation of initrd reserve to avoid duplication.
> > 
> > v3:
> > - split into four patches, suggested-by Palmer Dabbelt
> > v2:
> > - fix build error found by kernel test robot
> > 
> > Kefeng Wang (4):
> >    initrd: Add the preprocessor guard in initrd.h
> >    initramfs: Provide a common initrd reserve function
> >    ARM: Covert to reserve_initrd_mem()
> >    riscv: Covert to reserve_initrd_mem()
> > 
> >   arch/arm/mm/init.c     | 43 +--------------------------------
> >   arch/riscv/mm/init.c   | 54 +-----------------------------------------
> >   include/linux/initrd.h | 11 +++++++++
> >   init/initramfs.c       | 45 +++++++++++++++++++++++++++++++++++
> >   4 files changed, 58 insertions(+), 95 deletions(-)
> > 
> 

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

Re: [PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Russell King - ARM Linux admin]

On Mon, Jan 18, 2021 at 09:01:40AM +0800, Kefeng Wang wrote:
> 
> On 2021/1/17 18:09, Russell King - ARM Linux admin wrote:
> > On Sun, Jan 17, 2021 at 12:57:55PM +0800, Kefeng Wang wrote:
> > > Correct Russell's mail address (from linux@armlinux.org.uk to
> > > rmk+kernel@armlinux.org.uk, should update the MAINTAINERS)
> > No. MAINTAINERS is correct.
> 
> I got following message,  so I check mail of your recent patches, and send a
> new one.
> 
> Please ignore it, there may be some other problems.
> 
> "*Delivery has failed to these recipients or groups:*
> 
> linux@armlinux.org.uk <mailto:linux@armlinux.org.uk>
> A communication failure occurred during the delivery of this message. Please
> to resend the message later. If the problem continues, contact your
> helpdesk."

That is a most unhelpful bounce message - I suppose it's designed for
non-technical people to ensure that the problem can't be resolved.

From what I can see from my end, every attempt involving your email
address last week (wangkefeng.wang@huawei.com) has been successful, so
I suspect the problem is not at my end.

In any case, all @armlinux.org.uk addresses hit the same server, so
if there's a "communication failure" for the domain, it would affect
all local-parts equally.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

Re: [PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Kefeng Wang]

On 2021/1/18 17:17, Russell King - ARM Linux admin wrote:
> On Mon, Jan 18, 2021 at 09:01:40AM +0800, Kefeng Wang wrote:
>> On 2021/1/17 18:09, Russell King - ARM Linux admin wrote:
>>> On Sun, Jan 17, 2021 at 12:57:55PM +0800, Kefeng Wang wrote:
>>>> Correct Russell's mail address (from linux@armlinux.org.uk to
>>>> rmk+kernel@armlinux.org.uk, should update the MAINTAINERS)
>>> No. MAINTAINERS is correct.
>> I got following message,  so I check mail of your recent patches, and send a
>> new one.
>>
>> Please ignore it, there may be some other problems.
>>
>> "*Delivery has failed to these recipients or groups:*
>>
>> linux@armlinux.org.uk <mailto:linux@armlinux.org.uk>
>> A communication failure occurred during the delivery of this message. Please
>> to resend the message later. If the problem continues, contact your
>> helpdesk."
> That is a most unhelpful bounce message - I suppose it's designed for
> non-technical people to ensure that the problem can't be resolved.
>
> >From what I can see from my end, every attempt involving your email
> address last week (wangkefeng.wang@huawei.com) has been successful, so
> I suspect the problem is not at my end.

ok，thank you for letting me know that the email has been received,

any comment about the ARM part in the patchset  ;)

>
> In any case, all @armlinux.org.uk addresses hit the same server, so
> if there's a "communication failure" for the domain, it would affect
> all local-parts equally.
>

Re: [PATCH v3 0/4] initrd: Use unified initrd reserve function in ARM/RISCV

[Palmer Dabbelt]

On Thu, 14 Jan 2021 21:46:02 PST (-0800), wangkefeng.wang@huawei.com wrote:
> Use the same implementation of initrd reserve to avoid duplication.
>
> v3:
> - split into four patches, suggested-by Palmer Dabbelt
> v2:
> - fix build error found by kernel test robot
>
> Kefeng Wang (4):
>   initrd: Add the preprocessor guard in initrd.h
>   initramfs: Provide a common initrd reserve function
>   ARM: Covert to reserve_initrd_mem()
>   riscv: Covert to reserve_initrd_mem()
>
>  arch/arm/mm/init.c     | 43 +--------------------------------
>  arch/riscv/mm/init.c   | 54 +-----------------------------------------
>  include/linux/initrd.h | 11 +++++++++
>  init/initramfs.c       | 45 +++++++++++++++++++++++++++++++++++
>  4 files changed, 58 insertions(+), 95 deletions(-)

Thanks. I have a shared tag with the first two on top of 5.11-rc2 (the start of
my for-next), which I just merged into the riscv/for-next.

git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git -b shared-lib-reserve_initrd_mem

I'm happy to take the ARM patch if that's easier on your end, but for now I'm
dropping it.