On 10/25/24 at 05:11pm, David Hildenbrand wrote:
> Let's factor it out into include/linux/crash_dump.h, from where we can
> use it also outside of vmcore.c later.
LGTM,
Acked-by: Baoquan He <bhe@xxxxxxxxxx>
>
> Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
> ---
> fs/proc/vmcore.c | 21 ++-------------------
> include/linux/crash_dump.h | 14 ++++++++++++++
> 2 files changed, 16 insertions(+), 19 deletions(-)
>
> diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
> index 47652df95202..76fdc3fb8c0e 100644
> --- a/fs/proc/vmcore.c
> +++ b/fs/proc/vmcore.c
> @@ -683,11 +683,6 @@ static const struct proc_ops vmcore_proc_ops = {
> .proc_mmap = mmap_vmcore,
> };
>
> -static struct vmcore_mem_node * __init get_new_element(void)
> -{
> - return kzalloc(sizeof(struct vmcore_mem_node), GFP_KERNEL);
> -}
> -
> static u64 get_vmcore_size(size_t elfsz, size_t elfnotesegsz,
> struct list_head *vc_list)
> {
> @@ -1090,7 +1085,6 @@ static int __init process_ptload_program_headers_elf64(char *elfptr,
> size_t elfnotes_sz,
> struct list_head *vc_list)
> {
> - struct vmcore_mem_node *new;
> int i;
> Elf64_Ehdr *ehdr_ptr;
> Elf64_Phdr *phdr_ptr;
> @@ -1113,13 +1107,8 @@ static int __init process_ptload_program_headers_elf64(char *elfptr,
> end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE);
> size = end - start;
>
> - /* Add this contiguous chunk of memory to vmcore list.*/
> - new = get_new_element();
> - if (!new)
> + if (vmcore_alloc_add_mem_node(vc_list, start, size))
> return -ENOMEM;
> - new->paddr = start;
> - new->size = size;
> - list_add_tail(&new->list, vc_list);
>
> /* Update the program header offset. */
> phdr_ptr->p_offset = vmcore_off + (paddr - start);
> @@ -1133,7 +1122,6 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,
> size_t elfnotes_sz,
> struct list_head *vc_list)
> {
> - struct vmcore_mem_node *new;
> int i;
> Elf32_Ehdr *ehdr_ptr;
> Elf32_Phdr *phdr_ptr;
> @@ -1156,13 +1144,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,
> end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE);
> size = end - start;
>
> - /* Add this contiguous chunk of memory to vmcore list.*/
> - new = get_new_element();
> - if (!new)
> + if (vmcore_alloc_add_mem_node(vc_list, start, size))
> return -ENOMEM;
> - new->paddr = start;
> - new->size = size;
> - list_add_tail(&new->list, vc_list);
>
> /* Update the program header offset */
> phdr_ptr->p_offset = vmcore_off + (paddr - start);
> diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
> index 5e48ab12c12b..ae77049fc023 100644
> --- a/include/linux/crash_dump.h
> +++ b/include/linux/crash_dump.h
> @@ -121,6 +121,20 @@ struct vmcore_mem_node {
> loff_t offset;
> };
>
> +/* Allocate a vmcore memory node and add it to the list. */
> +static inline int vmcore_alloc_add_mem_node(struct list_head *list,
> + unsigned long long paddr, unsigned long long size)
> +{
> + struct vmcore_mem_node *m = kzalloc(sizeof(*m), GFP_KERNEL);
> +
> + if (!m)
> + return -ENOMEM;
> + m->paddr = paddr;
> + m->size = size;
> + list_add_tail(&m->list, list);
> + return 0;
> +}
> +
> #else /* !CONFIG_CRASH_DUMP */
> static inline bool is_kdump_kernel(void) { return false; }
> #endif /* CONFIG_CRASH_DUMP */
> --
> 2.46.1
>
