crash_core: change the prototype of function parse_crashkernel()

Add two parameters 'low_size' and 'high' to function parse_crashkernel(),
later crashkernel=,high|low parsing will be added.  Make adjustments in
all call sites of parse_crashkernel() in arch.

Link: https://lkml.kernel.org/r/20230914033142.676708-3-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Zhen Lei <thunder.leizhen@huawei.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chen Jiahao <chenjiahao16@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c66b560562b301b0705163dfd201ee1e2cfbaa4c..e2bb7afd06839b41f74b9c0c0297e6cea7f88f26 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1010,7 +1010,8 @@ static void __init reserve_crashkernel(void)
 
        total_mem = get_total_mem();
        ret = parse_crashkernel(boot_command_line, total_mem,
-                               &crash_size, &crash_base);
+                               &crash_size, &crash_base,
+                               NULL, NULL);
        /* invalid value specified or crashkernel=0 */
        if (ret || !crash_size)
                return;

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 8a0f8604348b877e6cccd08a833638c50fa39ae7..801c59c39a8fc5e2220aaecac4df0053e2d5114b 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -142,7 +142,7 @@ static void __init reserve_crashkernel(void)
 
        /* crashkernel=X[@offset] */
        ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
-                               &crash_size, &crash_base);
+                               &crash_size, &crash_base, NULL, NULL);
        if (ret == -ENOENT) {
                ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
                if (ret || !crash_size)

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5a55ac82c13a47e86ca6e79db1469ce508edbdce..4faea2d2cf07d555bfe74efd45e11b11be436f19 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -277,7 +277,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
        int ret;
 
        ret = parse_crashkernel(boot_command_line, total,
-                       &size, &base);
+                       &size, &base, NULL, NULL);
        if (ret == 0 && size > 0) {
                if (!base) {
                        sort_regions(rsvd_region, *n);

diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
index 7783f0a3d742c7e0cce68d93cc9252eee4e7f381..4de32b07c0dcdb917c473cc96eaf3aa88182647d 100644 (file)
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -267,7 +267,9 @@ static void __init arch_parse_crashkernel(void)
        unsigned long long crash_base, crash_size;
 
        total_mem = memblock_phys_mem_size();
-       ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
+       ret = parse_crashkernel(boot_command_line, total_mem,
+                               &crash_size, &crash_base,
+                               NULL, NULL);
        if (ret < 0 || crash_size <= 0)
                return;
 

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index cb871eb784a7c12819666e50bd45cd576bc0e363..08321c945ac41021c5f24a02ef033d41cfe67244 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -460,7 +460,8 @@ static void __init mips_parse_crashkernel(void)
 
        total_mem = memblock_phys_mem_size();
        ret = parse_crashkernel(boot_command_line, total_mem,
-                               &crash_size, &crash_base);
+                               &crash_size, &crash_base,
+                               NULL, NULL);
        if (ret != 0 || crash_size <= 0)
                return;
 

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 3ff2da7b120b5090fe041efdebaf359bf2e32348..d14eda1e85896807bdabb61987e4b21f3ee949ea 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -313,7 +313,7 @@ static __init u64 fadump_calculate_reserve_size(void)
         * memory at a predefined offset.
         */
        ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
-                               &size, &base);
+                               &size, &base, NULL, NULL);
        if (ret == 0 && size > 0) {
                unsigned long max_size;
 

diff --git a/arch/powerpc/kexec/core.c b/arch/powerpc/kexec/core.c
index de64c7962991214b285626a4cb79b96643c10f56..9346c960b296f65fc81eb999f9048cbddfb2fe21 100644 (file)
--- a/arch/powerpc/kexec/core.c
+++ b/arch/powerpc/kexec/core.c
@@ -109,7 +109,7 @@ void __init reserve_crashkernel(void)
        total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
        /* use common parsing */
        ret = parse_crashkernel(boot_command_line, total_mem_sz,
-                       &crash_size, &crash_base);
+                       &crash_size, &crash_base, NULL, NULL);
        if (ret == 0 && crash_size > 0) {
                crashk_res.start = crash_base;
                crashk_res.end = crash_base + crash_size - 1;

diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c
index 2fb3edafe9ab65740ec1dcc7aefc55a71473a0bc..b4f2786a7d2b0be0ad3f064a89d79aad68999bdd 100644 (file)
--- a/arch/powerpc/mm/nohash/kaslr_booke.c
+++ b/arch/powerpc/mm/nohash/kaslr_booke.c
@@ -178,7 +178,7 @@ static void __init get_crash_kernel(void *fdt, unsigned long size)
        int ret;
 
        ret = parse_crashkernel(boot_command_line, size, &crash_size,
-                               &crash_base);
+                               &crash_base, NULL, NULL);
        if (ret != 0 || crash_size == 0)
                return;
        if (crash_base == 0)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 0798bd861dcb9adfcec5e39b2c0713e8d3b3f1c0..9fe448900059c1729cbd62a7a0b286c2c93219b7 100644 (file)
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -1388,7 +1388,7 @@ static void __init reserve_crashkernel(void)
        }
 
        ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
-                               &crash_size, &crash_base);
+                               &crash_size, &crash_base, NULL, NULL);
        if (ret == -ENOENT) {
                /* Fallback to crashkernel=X,[high,low] */
                ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index de6ad0fb2328a1b551105151da26bdb6b59c5fb2..e555b576d3c80b290a2ca082907aaa566aeb4a01 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -625,8 +625,8 @@ static void __init reserve_crashkernel(void)
        phys_addr_t low, high;
        int rc;
 
-       rc = parse_crashkernel(boot_command_line, ident_map_size, &crash_size,
-                              &crash_base);
+       rc = parse_crashkernel(boot_command_line, ident_map_size,
+                              &crash_size, &crash_base, NULL, NULL);
 
        crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
        crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);

diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index 223c14f44af7e43f4ca4e48a7c34a685b86cdc89..fa3a7b36190a2acfb4e64d724afad8e33a88f3e2 100644 (file)
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -154,7 +154,7 @@ void __init reserve_crashkernel(void)
        int ret;
 
        ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
-                       &crash_size, &crash_base);
+                       &crash_size, &crash_base, NULL, NULL);
        if (ret == 0 && crash_size > 0) {
                crashk_res.start = crash_base;
                crashk_res.end = crash_base + crash_size - 1;

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b098b1fa2470816a35d7784d93c0e7ae0fc83f6d..655c0481290537ffaf246f03e45f6c5be449adf4 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -553,7 +553,8 @@ static void __init reserve_crashkernel(void)
        total_mem = memblock_phys_mem_size();
 
        /* crashkernel=XM */
-       ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
+       ret = parse_crashkernel(boot_command_line, total_mem,
+                               &crash_size, &crash_base, NULL, NULL);
        if (ret != 0 || crash_size <= 0) {
                /* crashkernel=X,high */
                ret = parse_crashkernel_high(boot_command_line, total_mem,

diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 0c06561bf5ffd3b6b0c20089a18a779e15dbb095..6156355ef831793854078e1f2e72533e8e6ac65f 100644 (file)
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -80,7 +80,8 @@ Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
 void final_note(Elf_Word *buf);
 
 int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
-               unsigned long long *crash_size, unsigned long long *crash_base);
+               unsigned long long *crash_size, unsigned long long *crash_base,
+               unsigned long long *low_size, bool *high);
 int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
                unsigned long long *crash_size, unsigned long long *crash_base);
 int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 507113932aa9634168fa25e4bcc3bb1061f32b79..33ced5b5ed4e44743a1e8b38d5336d4faa014f99 100644 (file)
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -287,10 +287,19 @@ static int __init __parse_crashkernel(char *cmdline,
 int __init parse_crashkernel(char *cmdline,
                             unsigned long long system_ram,
                             unsigned long long *crash_size,
-                            unsigned long long *crash_base)
+                            unsigned long long *crash_base,
+                            unsigned long long *low_size,
+                            bool *high)
 {
-       return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
-                               NULL);
+       int ret;
+
+       /* crashkernel=X[@offset] */
+       ret = __parse_crashkernel(cmdline, system_ram, crash_size,
+                               crash_base, NULL);
+       if (!high)
+               return ret;
+
+       return 0;
 }
 
 int __init parse_crashkernel_high(char *cmdline,