s390/iomem: register initrd as an iomem resource when retain_initrd is set
PATCH v3 1/1 s390/iomem: register initrd as an iomem resource when retain_initrd is set
Currently, /proc/iomem contains no reference to initrd memory, even when initrd is retained and still held in RAM. This makes the memory ranges invisible from userspace, and unusable to programs such as kexec. (A sysfs bin file is created for initrd, but this doesn't help programs which need the explicit memory ranges)
Add initrd to standard_resources[] unconditionally. Add initrd as a child of iomem_resources only if retain_initrd is specified.
strstr() could match substrings like "retain_initrd=0" or "no_retain_initrd", but this is how PPC chose to check for "retain_initrd" param too. (arch/powerpc/kexec/ranges.c)
--- arch/s390/kernel/setup.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/s390/kernel/setup.c +22 -0
@@ -481,15 +481,22 @@ static struct resource bss_resource = { .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, }; +static struct resource initrd_resource = { + .name ="initrd" , + .flags =IORESOURCE_BUSY |IORESOURCE_SYSTEM_RAM , +}; +static struct resource __initdata *standard_resources[] = { &code_resource, &data_resource, &bss_resource, + &initrd_resource, };static void __init setup_resources (void ) {struct resource *res, *std_res, *sub_res; +bool retain_initrd = false;phys_addr_t start, end;int j;u64 i;
@@ -501,6 +508,19 @@ static void __init setup_resources(void) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop) -1 ; +if (IS_ENABLED (CONFIG_BLK_DEV_INITRD ) && retain_initrd) { +unsigned long initrd_addr, initrd_size; + +if (strstr (boot_command_line,"retain_initrd" )) + retain_initrd = true; +if (get_physmem_reserved (RR_INITRD , &initrd_addr, &initrd_size)) { + initrd_resource.start = initrd_addr; + initrd_resource.end = initrd_resource.start + initrd_size -1 ; + }else { + retain_initrd = false; + } + } +for_each_mem_range (i, &start, &end) { res =memblock_alloc_or_panic (sizeof (*res),8 ); res->flags =IORESOURCE_BUSY |IORESOURCE_SYSTEM_RAM ;
@@ -517,6 +537,8 @@ static void __init setup_resources(void)for (j =0 ; j <ARRAY_SIZE (standard_resources); j++) { std_res = standard_resources[j]; +if (std_res == &initrd_resource && !retain_initrd) +continue ;if (std_res->start < res->start || std_res->start > res->end)continue ;
Signature · 3 lines
2.55.0 base commit: 0f23d56f17fdfc7db69d51f64c8b91bbab947aa9
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [High] The logic to conditionally register the initrd resource is entirely dead code because it is gated…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [High] The logic to conditionally register the initrd resource is entirely dead code because it is gated by a condition that unconditionally evaluates to false.
- [Medium] Using strstr() to parse retain_initrd from the command line incorrectly matches substrings like retain_initrd=0, creating a state mismatch with generic kernel memory management. --
--- Patch [1]: [PATCH v3] s390/iomem: register initrd as an iomem resource when retain_initrd is set --- commit baa672ec021ea4348cfb0f9915360847a352531c
Author: Joseph Cathcart <[email protected]>
s390/iomem: register initrd as an iomem resource when retain_initrd is set
This commit adds the initrd memory range to the standard resources in /proc/iomem on s390. It conditionally registers it as a child of iomem_resources if retain_initrd is specified on the boot command line.
Quoted 4 lines
arch/s390/kernel/setup.c +0
-0
[ ... ]
Quoted 7 lines
static void
__initsetup_resources(void)
{arch/s390/kernel/setup.c +1
-0struct resource *res, *std_res, *sub_res; +bool retain_initrd = false;phys_addr_t start, end;int j;u64 i;
[ ... ]
arch/s390/kernel/setup.c static void __init setup_resources(void) · line 511
Quoted 5 lines
arch/s390/kernel/setup.c +1
-0@@ -501,6 +508,19 @@ static void __init setup_resources(void) bss_resource.start =__pa_symbol (__bss_start); bss_resource.end =__pa_symbol (__bss_stop) -1 ; +if (IS_ENABLED (CONFIG_BLK_DEV_INITRD ) && retain_initrd) {
[Severity: High]
Since retain_initrd is initialized to false at the start of setup_resources() and hasn't been modified before this check, will this condition always evaluate to false?
It looks like this block is completely unreachable, which would prevent the initrd resource from being populated or registered.
arch/s390/kernel/setup.c static void __init setup_resources(void) · line 514
Quoted 3 lines
arch/s390/kernel/setup.c +3
-0+unsigned long initrd_addr, initrd_size; + +if (strstr (boot_command_line,"retain_initrd" ))
[Severity: Medium]
If the unreachable code issue above is addressed, is there a risk that using strstr() will incorrectly match strings like "retain_initrd=0"?
The generic kernel code in init/initramfs.c interprets "retain_initrd=0" as disabled and frees the initrd memory back to the buddy allocator. If this string match catches "retain_initrd=0", would we end up registering freed memory as an IORESOURCE_BUSY initrd resource?
This mismatch could mislead userspace tools about system RAM availability.
Quoted 8 lines
arch/s390/kernel/setup.c +8
-0+ retain_initrd = true; +if (get_physmem_reserved (RR_INITRD , &initrd_addr, &initrd_size)) { + initrd_resource.start = initrd_addr; + initrd_resource.end = initrd_resource.start + initrd_size -1 ; + }else { + retain_initrd = false; + } + }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1