From: Lakshmi Ramasubramanian <nramas@linux•microsoft.com>
To: zohar@linux•ibm.com, bauerman@linux•ibm.com, robh@kernel•org,
takahiro.akashi@linaro•org, gregkh@linuxfoundation•org,
will@kernel•org, joe@perches•com, catalin.marinas@arm•com,
mpe@ellerman•id.au, sfr@canb•auug.org.au
Cc: mark.rutland@arm•com, tao.li@vivo•com, paulus@samba•org,
vincenzo.frascino@arm•com, frowand.list@gmail•com,
sashal@kernel•org, masahiroy@kernel•org, jmorris@namei•org,
allison@lohutok•net, serge@hallyn•com,
devicetree@vger•kernel.org, pasha.tatashin@soleen•com,
prsriva@linux•microsoft.com, hsinyi@chromium•org,
linux-arm-kernel@lists•infradead.org, christophe.leroy@c-s•fr,
mbrugger@suse•com, balajib@linux•microsoft.com,
dmitry.kasatkin@gmail•com, linux-kernel@vger•kernel.org,
james.morse@arm•com, linux-integrity@vger•kernel.org,
linuxppc-dev@lists•ozlabs.org
Subject: [PATCH v19 02/13] arm64: Use ELF fields defined in 'struct kimage'
Date: Sun, 21 Feb 2021 09:49:19 -0800 [thread overview]
Message-ID: <20210221174930.27324-3-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210221174930.27324-1-nramas@linux.microsoft.com>
ELF related fields elf_headers, elf_headers_sz, and elf_headers_mem
have been moved from 'struct kimage_arch' to 'struct kimage' as
elf_headers, elf_headers_sz, and elf_load_addr respectively.
Use the ELF fields defined in 'struct kimage'.
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux•microsoft.com>
Suggested-by: Rob Herring <robh@kernel•org>
Fixes: 33488dc4d61f ("of: Add a common kexec FDT setup function")
Reported-by: kernel test robot <lkp@intel•com>
---
arch/arm64/include/asm/kexec.h | 4 ----
arch/arm64/kernel/machine_kexec_file.c | 18 +++++++++---------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index d24b527e8c00..12a561a54128 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -96,10 +96,6 @@ static inline void crash_post_resume(void) {}
struct kimage_arch {
void *dtb;
unsigned long dtb_mem;
- /* Core ELF header buffer */
- void *elf_headers;
- unsigned long elf_headers_mem;
- unsigned long elf_headers_sz;
};
extern const struct kexec_file_ops kexec_image_ops;
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 03210f644790..5553de3d401a 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -43,9 +43,9 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
vfree(image->arch.dtb);
image->arch.dtb = NULL;
- vfree(image->arch.elf_headers);
- image->arch.elf_headers = NULL;
- image->arch.elf_headers_sz = 0;
+ vfree(image->elf_headers);
+ image->elf_headers = NULL;
+ image->elf_headers_sz = 0;
return kexec_image_post_load_cleanup_default(image);
}
@@ -73,8 +73,8 @@ static int setup_dtb(struct kimage *image,
/* add linux,elfcorehdr */
ret = fdt_appendprop_addrrange(dtb, 0, off,
FDT_PROP_KEXEC_ELFHDR,
- image->arch.elf_headers_mem,
- image->arch.elf_headers_sz);
+ image->elf_load_addr,
+ image->elf_headers_sz);
if (ret)
return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
@@ -282,12 +282,12 @@ int load_other_segments(struct kimage *image,
vfree(headers);
goto out_err;
}
- image->arch.elf_headers = headers;
- image->arch.elf_headers_mem = kbuf.mem;
- image->arch.elf_headers_sz = headers_sz;
+ image->elf_headers = headers;
+ image->elf_load_addr = kbuf.mem;
+ image->elf_headers_sz = headers_sz;
pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
- image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
+ image->elf_load_addr, kbuf.bufsz, kbuf.memsz);
}
/* load initrd */
--
2.30.0
next prev parent reply other threads:[~2021-02-21 17:51 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 17:49 [PATCH v19 00/13] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 01/13] kexec: Move ELF fields to struct kimage Lakshmi Ramasubramanian
2021-02-24 1:03 ` Thiago Jung Bauermann
2021-02-21 17:49 ` Lakshmi Ramasubramanian [this message]
2021-02-24 1:07 ` [PATCH v19 02/13] arm64: Use ELF fields defined in 'struct kimage' Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 03/13] powerpc: " Lakshmi Ramasubramanian
2021-02-24 1:07 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 04/13] x86: " Lakshmi Ramasubramanian
2021-02-24 1:08 ` Thiago Jung Bauermann
2021-02-24 1:13 ` Thiago Jung Bauermann
2021-02-21 17:49 ` [PATCH v19 05/13] of: Add a common kexec FDT setup function Lakshmi Ramasubramanian
2021-02-24 1:20 ` Thiago Jung Bauermann
2021-02-24 1:57 ` Lakshmi Ramasubramanian
2021-06-15 12:17 ` Geert Uytterhoeven
2021-06-15 14:01 ` Rob Herring
2021-06-15 16:13 ` nramas
2021-06-15 16:34 ` Rob Herring
2021-06-16 2:23 ` Michael Ellerman
2021-06-16 15:12 ` Rob Herring
2021-02-21 17:49 ` [PATCH v19 06/13] arm64: Use common of_kexec_alloc_and_setup_fdt() Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 07/13] powerpc: " Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 08/13] powerpc: Move ima buffer fields to struct kimage Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 09/13] powerpc: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 10/13] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 11/13] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 12/13] powerpc: Delete unused function delete_fdt_mem_rsv() Lakshmi Ramasubramanian
2021-02-21 17:49 ` [PATCH v19 13/13] arm64: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-03-02 15:06 ` [PATCH v19 00/13] Carry forward IMA measurement log on kexec on ARM64 Rob Herring
2021-03-02 15:25 ` Lakshmi Ramasubramanian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210221174930.27324-3-nramas@linux.microsoft.com \
--to=nramas@linux$(echo .)microsoft.com \
--cc=allison@lohutok$(echo .)net \
--cc=balajib@linux$(echo .)microsoft.com \
--cc=bauerman@linux$(echo .)ibm.com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=christophe.leroy@c-s$(echo .)fr \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=frowand.list@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hsinyi@chromium$(echo .)org \
--cc=james.morse@arm$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=joe@perches$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-integrity@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=masahiroy@kernel$(echo .)org \
--cc=mbrugger@suse$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=pasha.tatashin@soleen$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=prsriva@linux$(echo .)microsoft.com \
--cc=robh@kernel$(echo .)org \
--cc=sashal@kernel$(echo .)org \
--cc=serge@hallyn$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=takahiro.akashi@linaro$(echo .)org \
--cc=tao.li@vivo$(echo .)com \
--cc=vincenzo.frascino@arm$(echo .)com \
--cc=will@kernel$(echo .)org \
--cc=zohar@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox