On 2023/8/29 20:16, Baoquan He wrote:
> 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.
Reviewed-by: Zhen Lei <thunder.leizhen@xxxxxxxxxx>
>
> Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> ---
> arch/arm/kernel/setup.c | 3 ++-
> arch/arm64/mm/init.c | 2 +-
> arch/ia64/kernel/setup.c | 2 +-
> arch/loongarch/kernel/setup.c | 4 +++-
> arch/mips/kernel/setup.c | 3 ++-
> arch/powerpc/kernel/fadump.c | 2 +-
> arch/powerpc/kexec/core.c | 2 +-
> arch/powerpc/mm/nohash/kaslr_booke.c | 2 +-
> arch/riscv/mm/init.c | 2 +-
> arch/s390/kernel/setup.c | 4 ++--
> arch/sh/kernel/machine_kexec.c | 2 +-
> arch/x86/kernel/setup.c | 3 ++-
> include/linux/crash_core.h | 3 ++-
> kernel/crash_core.c | 15 ++++++++++++---
> 14 files changed, 32 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
> index c66b560562b3..e2bb7afd0683 100644
> --- 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 4fcb88a445ef..4ad637508b75 100644
> --- 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 5a55ac82c13a..4faea2d2cf07 100644
> --- 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 9d830ab4e302..776a068d8718 100644
> --- 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 cb871eb784a7..08321c945ac4 100644
> --- 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 ea0a073abd96..7dbdeba56e74 100644
> --- 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 de64c7962991..9346c960b296 100644
> --- 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 2fb3edafe9ab..b4f2786a7d2b 100644
> --- 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 e4c35ac2357f..a9ef0824f905 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -1332,7 +1332,7 @@ static void __init reserve_crashkernel(void)
> }
>
> ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
> - &crash_size, &crash_base);
> + &crash_size, &crash_base, NULL, NULL);
> if (ret || !crash_size)
> return;
>
> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
> index c744104e4a9c..98204a5f62b1 100644
> --- a/arch/s390/kernel/setup.c
> +++ b/arch/s390/kernel/setup.c
> @@ -626,8 +626,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 223c14f44af7..fa3a7b36190a 100644
> --- 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 fd975a4a5200..382c66d2cf71 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -558,7 +558,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 de62a722431e..2e76289699ff 100644
> --- a/include/linux/crash_core.h
> +++ b/include/linux/crash_core.h
> @@ -78,7 +78,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 f27b4e45d410..f6a5c219e2e1 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -280,10 +280,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,
>
--
Regards,
Zhen Lei
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
