lkml.org 
[lkml]   [2023]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v16 2/7] crash: prototype change for crash_prepare_elf64_headers()
    Date
    From within crash_prepare_elf64_headers() there is a need to
    reference the struct kimage hotplug members. As such, this
    change passes the struct kimage as a parameter to the
    crash_prepare_elf64_headers(). The hotplug members are added
    in "crash: add generic infrastructure for crash hotplug support".

    This is preparation for later patch, no functionality change.

    Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
    Acked-by: Baoquan He <bhe@redhat.com>
    Acked-by: David Hildenbrand <david@redhat.com>
    ---
    arch/arm64/kernel/machine_kexec_file.c | 6 +++---
    arch/powerpc/kexec/file_load_64.c | 2 +-
    arch/riscv/kernel/elf_kexec.c | 7 ++++---
    arch/x86/kernel/crash.c | 2 +-
    include/linux/kexec.h | 7 +++++--
    kernel/crash_core.c | 4 ++--
    6 files changed, 16 insertions(+), 12 deletions(-)

    diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
    index a11a6e14ba89..2f7b773a83bb 100644
    --- a/arch/arm64/kernel/machine_kexec_file.c
    +++ b/arch/arm64/kernel/machine_kexec_file.c
    @@ -39,7 +39,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
    return kexec_image_post_load_cleanup_default(image);
    }

    -static int prepare_elf_headers(void **addr, unsigned long *sz)
    +static int prepare_elf_headers(struct kimage *image, void **addr, unsigned long *sz)
    {
    struct crash_mem *cmem;
    unsigned int nr_ranges;
    @@ -64,7 +64,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
    }

    /* Exclude crashkernel region */
    - ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
    + ret = crash_exclude_mem_range(image, cmem, crashk_res.start, crashk_res.end);
    if (ret)
    goto out;

    @@ -74,7 +74,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
    goto out;
    }

    - ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
    + ret = crash_prepare_elf64_headers(image, cmem, true, addr, sz);

    out:
    kfree(cmem);
    diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
    index af8854f9eae3..e51d8059535b 100644
    --- a/arch/powerpc/kexec/file_load_64.c
    +++ b/arch/powerpc/kexec/file_load_64.c
    @@ -799,7 +799,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
    goto out;

    /* Setup elfcorehdr segment */
    - ret = crash_prepare_elf64_headers(cmem, false, &headers, &headers_sz);
    + ret = crash_prepare_elf64_headers(image, cmem, false, &headers, &headers_sz);
    if (ret) {
    pr_err("Failed to prepare elf headers for the core\n");
    goto out;
    diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c
    index 5372b708fae2..8bb2233bd5bb 100644
    --- a/arch/riscv/kernel/elf_kexec.c
    +++ b/arch/riscv/kernel/elf_kexec.c
    @@ -130,7 +130,8 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
    return 0;
    }

    -static int prepare_elf_headers(void **addr, unsigned long *sz)
    +static int prepare_elf_headers(struct kimage *image,
    + void **addr, unsigned long *sz)
    {
    struct crash_mem *cmem;
    unsigned int nr_ranges;
    @@ -152,7 +153,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
    /* Exclude crashkernel region */
    ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
    if (!ret)
    - ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
    + ret = crash_prepare_elf64_headers(image, cmem, true, addr, sz);

    out:
    kfree(cmem);
    @@ -224,7 +225,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,

    /* Add elfcorehdr */
    if (image->type == KEXEC_TYPE_CRASH) {
    - ret = prepare_elf_headers(&headers, &headers_sz);
    + ret = prepare_elf_headers(image, &headers, &headers_sz);
    if (ret) {
    pr_err("Preparing elf core header failed\n");
    goto out;
    diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
    index 9730c88530fc..9ceb93c176a6 100644
    --- a/arch/x86/kernel/crash.c
    +++ b/arch/x86/kernel/crash.c
    @@ -265,7 +265,7 @@ static int prepare_elf_headers(struct kimage *image, void **addr,
    goto out;

    /* By default prepare 64bit headers */
    - ret = crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
    + ret = crash_prepare_elf64_headers(image, cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);

    out:
    vfree(cmem);
    diff --git a/include/linux/kexec.h b/include/linux/kexec.h
    index 5dd4343c1bbe..c8662a48d455 100644
    --- a/include/linux/kexec.h
    +++ b/include/linux/kexec.h
    @@ -250,8 +250,11 @@ struct crash_mem {
    extern int crash_exclude_mem_range(struct crash_mem *mem,
    unsigned long long mstart,
    unsigned long long mend);
    -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
    - void **addr, unsigned long *sz);
    +extern int crash_prepare_elf64_headers(struct kimage *image,
    + struct crash_mem *mem,
    + int need_kernel_map,
    + void **addr,
    + unsigned long *sz);

    #ifndef arch_kexec_apply_relocations_add
    /*
    diff --git a/kernel/crash_core.c b/kernel/crash_core.c
    index f10e2266c310..92eb7dc05457 100644
    --- a/kernel/crash_core.c
    +++ b/kernel/crash_core.c
    @@ -315,8 +315,8 @@ static int __init parse_crashkernel_dummy(char *arg)
    }
    early_param("crashkernel", parse_crashkernel_dummy);

    -int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
    - void **addr, unsigned long *sz)
    +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
    + int need_kernel_map, void **addr, unsigned long *sz)
    {
    Elf64_Ehdr *ehdr;
    Elf64_Phdr *phdr;
    --
    2.31.1
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:3.545 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site