[PATCH v17 3/6] powerpc/kexec: move *_memory_ranges functions to ranges.c
Hari Bathini
hbathini at linux.ibm.com
Sun Mar 3 00:18:19 AEDT 2024
On 26/02/24 2:11 pm, Sourabh Jain wrote:
> Move the following functions form kexec/{file_load_64.c => ranges.c} and
> make them public so that components other KEXEC_FILE can also use these
> functions.
> 1. get_exclude_memory_ranges
> 2. get_reserved_memory_ranges
> 3. get_crash_memory_ranges
> 4. get_usable_memory_ranges
>
> Later in the series get_crash_memory_ranges function is utilized for
> in-kernel updates to kdump image during CPU/Memory hotplug or
> online/offline events for both kexec_load and kexec_file_load syscalls.
>
> Since the above functions are moved to ranges.c, some of the helper
> functions in ranges.c are no longer required to be public. Mark them as
> static and removed them from kexec_ranges.h header file.
>
> Finally, remove the CONFIG_KEXEC_FILE build dependency for range.c
> because it is required for other config, such as CONFIG_CRASH_DUMP.
>
> No functional changes are intended.
>
Acked-by: Hari Bathini <hbathini at linux.ibm.com>
> Signed-off-by: Sourabh Jain <sourabhjain at linux.ibm.com>
> Cc: Akhil Raj <lf32.dev at gmail.com>
> Cc: Andrew Morton <akpm at linux-foundation.org>
> Cc: Aneesh Kumar K.V <aneesh.kumar at kernel.org>
> Cc: Baoquan He <bhe at redhat.com>
> Cc: Borislav Petkov (AMD) <bp at alien8.de>
> Cc: Boris Ostrovsky <boris.ostrovsky at oracle.com>
> Cc: Christophe Leroy <christophe.leroy at csgroup.eu>
> Cc: Dave Hansen <dave.hansen at linux.intel.com>
> Cc: Dave Young <dyoung at redhat.com>
> Cc: David Hildenbrand <david at redhat.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Hari Bathini <hbathini at linux.ibm.com>
> Cc: Laurent Dufour <laurent.dufour at fr.ibm.com>
> Cc: Mahesh Salgaonkar <mahesh at linux.ibm.com>
> Cc: Michael Ellerman <mpe at ellerman.id.au>
> Cc: Mimi Zohar <zohar at linux.ibm.com>
> Cc: Naveen N Rao <naveen at kernel.org>
> Cc: Oscar Salvador <osalvador at suse.de>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: Valentin Schneider <vschneid at redhat.com>
> Cc: Vivek Goyal <vgoyal at redhat.com>
> Cc: kexec at lists.infradead.org
> Cc: x86 at kernel.org
> ---
> arch/powerpc/include/asm/kexec_ranges.h | 19 +-
> arch/powerpc/kexec/Makefile | 4 +-
> arch/powerpc/kexec/file_load_64.c | 190 --------------------
> arch/powerpc/kexec/ranges.c | 227 +++++++++++++++++++++++-
> 4 files changed, 224 insertions(+), 216 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kexec_ranges.h b/arch/powerpc/include/asm/kexec_ranges.h
> index f83866a19e87..8489e844b447 100644
> --- a/arch/powerpc/include/asm/kexec_ranges.h
> +++ b/arch/powerpc/include/asm/kexec_ranges.h
> @@ -7,19 +7,8 @@
> void sort_memory_ranges(struct crash_mem *mrngs, bool merge);
> struct crash_mem *realloc_mem_ranges(struct crash_mem **mem_ranges);
> int add_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size);
> -int add_tce_mem_ranges(struct crash_mem **mem_ranges);
> -int add_initrd_mem_range(struct crash_mem **mem_ranges);
> -#ifdef CONFIG_PPC_64S_HASH_MMU
> -int add_htab_mem_range(struct crash_mem **mem_ranges);
> -#else
> -static inline int add_htab_mem_range(struct crash_mem **mem_ranges)
> -{
> - return 0;
> -}
> -#endif
> -int add_kernel_mem_range(struct crash_mem **mem_ranges);
> -int add_rtas_mem_range(struct crash_mem **mem_ranges);
> -int add_opal_mem_range(struct crash_mem **mem_ranges);
> -int add_reserved_mem_ranges(struct crash_mem **mem_ranges);
> -
> +int get_exclude_memory_ranges(struct crash_mem **mem_ranges);
> +int get_reserved_memory_ranges(struct crash_mem **mem_ranges);
> +int get_crash_memory_ranges(struct crash_mem **mem_ranges);
> +int get_usable_memory_ranges(struct crash_mem **mem_ranges);
> #endif /* _ASM_POWERPC_KEXEC_RANGES_H */
> diff --git a/arch/powerpc/kexec/Makefile b/arch/powerpc/kexec/Makefile
> index 8e469c4da3f8..470eb0453e17 100644
> --- a/arch/powerpc/kexec/Makefile
> +++ b/arch/powerpc/kexec/Makefile
> @@ -3,11 +3,11 @@
> # Makefile for the linux kernel.
> #
>
> -obj-y += core.o core_$(BITS).o
> +obj-y += core.o core_$(BITS).o ranges.o
>
> obj-$(CONFIG_PPC32) += relocate_32.o
>
> -obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o
> +obj-$(CONFIG_KEXEC_FILE) += file_load.o file_load_$(BITS).o elf_$(BITS).o
> obj-$(CONFIG_VMCORE_INFO) += vmcore_info.o
> obj-$(CONFIG_CRASH_DUMP) += crash.o
>
> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
> index 1bc65de6174f..6a01f62b8fcf 100644
> --- a/arch/powerpc/kexec/file_load_64.c
> +++ b/arch/powerpc/kexec/file_load_64.c
> @@ -47,83 +47,6 @@ const struct kexec_file_ops * const kexec_file_loaders[] = {
> NULL
> };
>
> -/**
> - * get_exclude_memory_ranges - Get exclude memory ranges. This list includes
> - * regions like opal/rtas, tce-table, initrd,
> - * kernel, htab which should be avoided while
> - * setting up kexec load segments.
> - * @mem_ranges: Range list to add the memory ranges to.
> - *
> - * Returns 0 on success, negative errno on error.
> - */
> -static int get_exclude_memory_ranges(struct crash_mem **mem_ranges)
> -{
> - int ret;
> -
> - ret = add_tce_mem_ranges(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_initrd_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_htab_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_kernel_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_rtas_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_opal_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_reserved_mem_ranges(mem_ranges);
> - if (ret)
> - goto out;
> -
> - /* exclude memory ranges should be sorted for easy lookup */
> - sort_memory_ranges(*mem_ranges, true);
> -out:
> - if (ret)
> - pr_err("Failed to setup exclude memory ranges\n");
> - return ret;
> -}
> -
> -/**
> - * get_reserved_memory_ranges - Get reserve memory ranges. This list includes
> - * memory regions that should be added to the
> - * memory reserve map to ensure the region is
> - * protected from any mischief.
> - * @mem_ranges: Range list to add the memory ranges to.
> - *
> - * Returns 0 on success, negative errno on error.
> - */
> -static int get_reserved_memory_ranges(struct crash_mem **mem_ranges)
> -{
> - int ret;
> -
> - ret = add_rtas_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_tce_mem_ranges(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_reserved_mem_ranges(mem_ranges);
> -out:
> - if (ret)
> - pr_err("Failed to setup reserved memory ranges\n");
> - return ret;
> -}
> -
> /**
> * __locate_mem_hole_top_down - Looks top down for a large enough memory hole
> * in the memory regions between buf_min & buf_max
> @@ -322,119 +245,6 @@ static int locate_mem_hole_bottom_up_ppc64(struct kexec_buf *kbuf,
> }
>
> #ifdef CONFIG_CRASH_DUMP
> -/**
> - * get_usable_memory_ranges - Get usable memory ranges. This list includes
> - * regions like crashkernel, opal/rtas & tce-table,
> - * that kdump kernel could use.
> - * @mem_ranges: Range list to add the memory ranges to.
> - *
> - * Returns 0 on success, negative errno on error.
> - */
> -static int get_usable_memory_ranges(struct crash_mem **mem_ranges)
> -{
> - int ret;
> -
> - /*
> - * Early boot failure observed on guests when low memory (first memory
> - * block?) is not added to usable memory. So, add [0, crashk_res.end]
> - * instead of [crashk_res.start, crashk_res.end] to workaround it.
> - * Also, crashed kernel's memory must be added to reserve map to
> - * avoid kdump kernel from using it.
> - */
> - ret = add_mem_range(mem_ranges, 0, crashk_res.end + 1);
> - if (ret)
> - goto out;
> -
> - ret = add_rtas_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_opal_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_tce_mem_ranges(mem_ranges);
> -out:
> - if (ret)
> - pr_err("Failed to setup usable memory ranges\n");
> - return ret;
> -}
> -
> -/**
> - * get_crash_memory_ranges - Get crash memory ranges. This list includes
> - * first/crashing kernel's memory regions that
> - * would be exported via an elfcore.
> - * @mem_ranges: Range list to add the memory ranges to.
> - *
> - * Returns 0 on success, negative errno on error.
> - */
> -static int get_crash_memory_ranges(struct crash_mem **mem_ranges)
> -{
> - phys_addr_t base, end;
> - struct crash_mem *tmem;
> - u64 i;
> - int ret;
> -
> - for_each_mem_range(i, &base, &end) {
> - u64 size = end - base;
> -
> - /* Skip backup memory region, which needs a separate entry */
> - if (base == BACKUP_SRC_START) {
> - if (size > BACKUP_SRC_SIZE) {
> - base = BACKUP_SRC_END + 1;
> - size -= BACKUP_SRC_SIZE;
> - } else
> - continue;
> - }
> -
> - ret = add_mem_range(mem_ranges, base, size);
> - if (ret)
> - goto out;
> -
> - /* Try merging adjacent ranges before reallocation attempt */
> - if ((*mem_ranges)->nr_ranges == (*mem_ranges)->max_nr_ranges)
> - sort_memory_ranges(*mem_ranges, true);
> - }
> -
> - /* Reallocate memory ranges if there is no space to split ranges */
> - tmem = *mem_ranges;
> - if (tmem && (tmem->nr_ranges == tmem->max_nr_ranges)) {
> - tmem = realloc_mem_ranges(mem_ranges);
> - if (!tmem)
> - goto out;
> - }
> -
> - /* Exclude crashkernel region */
> - ret = crash_exclude_mem_range(tmem, crashk_res.start, crashk_res.end);
> - if (ret)
> - goto out;
> -
> - /*
> - * FIXME: For now, stay in parity with kexec-tools but if RTAS/OPAL
> - * regions are exported to save their context at the time of
> - * crash, they should actually be backed up just like the
> - * first 64K bytes of memory.
> - */
> - ret = add_rtas_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - ret = add_opal_mem_range(mem_ranges);
> - if (ret)
> - goto out;
> -
> - /* create a separate program header for the backup region */
> - ret = add_mem_range(mem_ranges, BACKUP_SRC_START, BACKUP_SRC_SIZE);
> - if (ret)
> - goto out;
> -
> - sort_memory_ranges(*mem_ranges, false);
> -out:
> - if (ret)
> - pr_err("Failed to setup crash memory ranges\n");
> - return ret;
> -}
> -
> /**
> * check_realloc_usable_mem - Reallocate buffer if it can't accommodate entries
> * @um_info: Usable memory buffer and ranges info.
> diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c
> index fb3e12f15214..297b8bc97b9f 100644
> --- a/arch/powerpc/kexec/ranges.c
> +++ b/arch/powerpc/kexec/ranges.c
> @@ -20,9 +20,13 @@
> #include <linux/kexec.h>
> #include <linux/of.h>
> #include <linux/slab.h>
> +#include <linux/memblock.h>
> +#include <linux/crash_core.h>
> #include <asm/sections.h>
> #include <asm/kexec_ranges.h>
> +#include <asm/crashdump-ppc64.h>
>
> +#if defined(CONFIG_KEXEC_FILE) || defined(CONFIG_CRASH_DUMP)
> /**
> * get_max_nr_ranges - Get the max no. of ranges crash_mem structure
> * could hold, given the size allocated for it.
> @@ -234,13 +238,16 @@ int add_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size)
> return __add_mem_range(mem_ranges, base, size);
> }
>
> +#endif /* CONFIG_KEXEC_FILE || CONFIG_CRASH_DUMP */
> +
> +#ifdef CONFIG_KEXEC_FILE
> /**
> * add_tce_mem_ranges - Adds tce-table range to the given memory ranges list.
> * @mem_ranges: Range list to add the memory range(s) to.
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_tce_mem_ranges(struct crash_mem **mem_ranges)
> +static int add_tce_mem_ranges(struct crash_mem **mem_ranges)
> {
> struct device_node *dn = NULL;
> int ret = 0;
> @@ -279,7 +286,7 @@ int add_tce_mem_ranges(struct crash_mem **mem_ranges)
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_initrd_mem_range(struct crash_mem **mem_ranges)
> +static int add_initrd_mem_range(struct crash_mem **mem_ranges)
> {
> u64 base, end;
> int ret;
> @@ -296,7 +303,6 @@ int add_initrd_mem_range(struct crash_mem **mem_ranges)
> return ret;
> }
>
> -#ifdef CONFIG_PPC_64S_HASH_MMU
> /**
> * add_htab_mem_range - Adds htab range to the given memory ranges list,
> * if it exists
> @@ -304,14 +310,18 @@ int add_initrd_mem_range(struct crash_mem **mem_ranges)
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_htab_mem_range(struct crash_mem **mem_ranges)
> +static int add_htab_mem_range(struct crash_mem **mem_ranges)
> {
> +
> +#ifdef CONFIG_PPC_64S_HASH_MMU
> if (!htab_address)
> return 0;
>
> return add_mem_range(mem_ranges, __pa(htab_address), htab_size_bytes);
> -}
> +#else
> + return 0;
> #endif
> +}
>
> /**
> * add_kernel_mem_range - Adds kernel text region to the given
> @@ -320,18 +330,20 @@ int add_htab_mem_range(struct crash_mem **mem_ranges)
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_kernel_mem_range(struct crash_mem **mem_ranges)
> +static int add_kernel_mem_range(struct crash_mem **mem_ranges)
> {
> return add_mem_range(mem_ranges, 0, __pa(_end));
> }
> +#endif /* CONFIG_KEXEC_FILE */
>
> +#if defined(CONFIG_KEXEC_FILE) || defined(CONFIG_CRASH_DUMP)
> /**
> * add_rtas_mem_range - Adds RTAS region to the given memory ranges list.
> * @mem_ranges: Range list to add the memory range to.
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_rtas_mem_range(struct crash_mem **mem_ranges)
> +static int add_rtas_mem_range(struct crash_mem **mem_ranges)
> {
> struct device_node *dn;
> u32 base, size;
> @@ -356,7 +368,7 @@ int add_rtas_mem_range(struct crash_mem **mem_ranges)
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_opal_mem_range(struct crash_mem **mem_ranges)
> +static int add_opal_mem_range(struct crash_mem **mem_ranges)
> {
> struct device_node *dn;
> u64 base, size;
> @@ -374,7 +386,9 @@ int add_opal_mem_range(struct crash_mem **mem_ranges)
> of_node_put(dn);
> return ret;
> }
> +#endif /* CONFIG_KEXEC_FILE || CONFIG_CRASH_DUMP */
>
> +#ifdef CONFIG_KEXEC_FILE
> /**
> * add_reserved_mem_ranges - Adds "/reserved-ranges" regions exported by f/w
> * to the given memory ranges list.
> @@ -382,7 +396,7 @@ int add_opal_mem_range(struct crash_mem **mem_ranges)
> *
> * Returns 0 on success, negative errno on error.
> */
> -int add_reserved_mem_ranges(struct crash_mem **mem_ranges)
> +static int add_reserved_mem_ranges(struct crash_mem **mem_ranges)
> {
> int n_mem_addr_cells, n_mem_size_cells, i, len, cells, ret = 0;
> const __be32 *prop;
> @@ -410,3 +424,198 @@ int add_reserved_mem_ranges(struct crash_mem **mem_ranges)
>
> return ret;
> }
> +
> +/**
> + * get_reserved_memory_ranges - Get reserve memory ranges. This list includes
> + * memory regions that should be added to the
> + * memory reserve map to ensure the region is
> + * protected from any mischief.
> + * @mem_ranges: Range list to add the memory ranges to.
> + *
> + * Returns 0 on success, negative errno on error.
> + */
> +int get_reserved_memory_ranges(struct crash_mem **mem_ranges)
> +{
> + int ret;
> +
> + ret = add_rtas_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_tce_mem_ranges(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_reserved_mem_ranges(mem_ranges);
> +out:
> + if (ret)
> + pr_err("Failed to setup reserved memory ranges\n");
> + return ret;
> +}
> +
> +/**
> + * get_exclude_memory_ranges - Get exclude memory ranges. This list includes
> + * regions like opal/rtas, tce-table, initrd,
> + * kernel, htab which should be avoided while
> + * setting up kexec load segments.
> + * @mem_ranges: Range list to add the memory ranges to.
> + *
> + * Returns 0 on success, negative errno on error.
> + */
> +int get_exclude_memory_ranges(struct crash_mem **mem_ranges)
> +{
> + int ret;
> +
> + ret = add_tce_mem_ranges(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_initrd_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_htab_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_kernel_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_rtas_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_opal_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_reserved_mem_ranges(mem_ranges);
> + if (ret)
> + goto out;
> +
> + /* exclude memory ranges should be sorted for easy lookup */
> + sort_memory_ranges(*mem_ranges, true);
> +out:
> + if (ret)
> + pr_err("Failed to setup exclude memory ranges\n");
> + return ret;
> +}
> +
> +#ifdef CONFIG_CRASH_DUMP
> +/**
> + * get_usable_memory_ranges - Get usable memory ranges. This list includes
> + * regions like crashkernel, opal/rtas & tce-table,
> + * that kdump kernel could use.
> + * @mem_ranges: Range list to add the memory ranges to.
> + *
> + * Returns 0 on success, negative errno on error.
> + */
> +int get_usable_memory_ranges(struct crash_mem **mem_ranges)
> +{
> + int ret;
> +
> + /*
> + * Early boot failure observed on guests when low memory (first memory
> + * block?) is not added to usable memory. So, add [0, crashk_res.end]
> + * instead of [crashk_res.start, crashk_res.end] to workaround it.
> + * Also, crashed kernel's memory must be added to reserve map to
> + * avoid kdump kernel from using it.
> + */
> + ret = add_mem_range(mem_ranges, 0, crashk_res.end + 1);
> + if (ret)
> + goto out;
> +
> + ret = add_rtas_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_opal_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_tce_mem_ranges(mem_ranges);
> +out:
> + if (ret)
> + pr_err("Failed to setup usable memory ranges\n");
> + return ret;
> +}
> +#endif /* CONFIG_CRASH_DUMP */
> +#endif /* CONFIG_KEXEC_FILE */
> +
> +#ifdef CONFIG_CRASH_DUMP
> +/**
> + * get_crash_memory_ranges - Get crash memory ranges. This list includes
> + * first/crashing kernel's memory regions that
> + * would be exported via an elfcore.
> + * @mem_ranges: Range list to add the memory ranges to.
> + *
> + * Returns 0 on success, negative errno on error.
> + */
> +int get_crash_memory_ranges(struct crash_mem **mem_ranges)
> +{
> + phys_addr_t base, end;
> + struct crash_mem *tmem;
> + u64 i;
> + int ret;
> +
> + for_each_mem_range(i, &base, &end) {
> + u64 size = end - base;
> +
> + /* Skip backup memory region, which needs a separate entry */
> + if (base == BACKUP_SRC_START) {
> + if (size > BACKUP_SRC_SIZE) {
> + base = BACKUP_SRC_END + 1;
> + size -= BACKUP_SRC_SIZE;
> + } else
> + continue;
> + }
> +
> + ret = add_mem_range(mem_ranges, base, size);
> + if (ret)
> + goto out;
> +
> + /* Try merging adjacent ranges before reallocation attempt */
> + if ((*mem_ranges)->nr_ranges == (*mem_ranges)->max_nr_ranges)
> + sort_memory_ranges(*mem_ranges, true);
> + }
> +
> + /* Reallocate memory ranges if there is no space to split ranges */
> + tmem = *mem_ranges;
> + if (tmem && (tmem->nr_ranges == tmem->max_nr_ranges)) {
> + tmem = realloc_mem_ranges(mem_ranges);
> + if (!tmem)
> + goto out;
> + }
> +
> + /* Exclude crashkernel region */
> + ret = crash_exclude_mem_range(tmem, crashk_res.start, crashk_res.end);
> + if (ret)
> + goto out;
> +
> + /*
> + * FIXME: For now, stay in parity with kexec-tools but if RTAS/OPAL
> + * regions are exported to save their context at the time of
> + * crash, they should actually be backed up just like the
> + * first 64K bytes of memory.
> + */
> + ret = add_rtas_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + ret = add_opal_mem_range(mem_ranges);
> + if (ret)
> + goto out;
> +
> + /* create a separate program header for the backup region */
> + ret = add_mem_range(mem_ranges, BACKUP_SRC_START, BACKUP_SRC_SIZE);
> + if (ret)
> + goto out;
> +
> + sort_memory_ranges(*mem_ranges, false);
> +out:
> + if (ret)
> + pr_err("Failed to setup crash memory ranges\n");
> + return ret;
> +}
> +#endif /* CONFIG_CRASH_DUMP */
More information about the Linuxppc-dev
mailing list