From: Eric DeVolder <eric.devolder@oracle.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
kexec@lists.infradead.org, ebiederm@xmission.com,
dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com,
nramas@linux.microsoft.com, thomas.lendacky@amd.com,
robh@kernel.org, efault@gmx.de, rppt@kernel.org,
david@redhat.com, konrad.wilk@oracle.com,
boris.ostrovsky@oracle.com, eric.devolder@oracle.com
Subject: [PATCH v7 3/8] crash: prototype change for crash_prepare_elf64_headers
Date: Wed, 13 Apr 2022 12:42:32 -0400 [thread overview]
Message-ID: <20220413164237.20845-4-eric.devolder@oracle.com> (raw)
In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com>
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().
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>
---
arch/arm64/kernel/machine_kexec_file.c | 6 +++---
arch/powerpc/kexec/file_load_64.c | 2 +-
arch/x86/kernel/crash.c | 3 ++-
include/linux/kexec.h | 5 +++--
kernel/kexec_file.c | 4 ++--
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 59c648d51848..7dbafb42ecf2 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;
@@ -67,7 +67,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
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);
kfree(cmem);
return ret;
@@ -96,7 +96,7 @@ int load_other_segments(struct kimage *image,
/* load elf core header */
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_err;
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index b4981b651d9a..07da6bf1cf24 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -797,7 +797,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/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 9730c88530fc..9db41cce8d97 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -265,7 +265,8 @@ 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 58d1b58a971e..f93f2591fc1e 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -227,8 +227,9 @@ 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 kernel_map,
- void **addr, unsigned long *sz);
+extern int crash_prepare_elf64_headers(struct kimage *image,
+ struct crash_mem *mem, int kernel_map,
+ void **addr, unsigned long *sz);
#endif /* CONFIG_KEXEC_FILE */
#ifdef CONFIG_KEXEC_ELF
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 8347fc158d2b..801d0d0a5012 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -1260,8 +1260,8 @@ int crash_exclude_mem_range(struct crash_mem *mem,
return 0;
}
-int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
- void **addr, unsigned long *sz)
+int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
+ int kernel_map, void **addr, unsigned long *sz)
{
Elf64_Ehdr *ehdr;
Elf64_Phdr *phdr;
--
2.27.0
next prev parent reply other threads:[~2022-04-13 16:45 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 16:42 [PATCH v7 0/8] crash: Kernel handling of CPU and memory hot un/plug Eric DeVolder
2022-04-13 16:42 ` [PATCH v7 1/8] x86/crash: fix minor typo/bug in debug message Eric DeVolder
2022-04-13 17:52 ` [tip: x86/kdump] x86/crash: Fix " tip-bot2 for Eric DeVolder
2022-04-28 9:49 ` [PATCH v7 1/8] x86/crash: fix " David Hildenbrand
2022-04-13 16:42 ` [PATCH v7 2/8] x86/crash: Introduce new options to support cpu and memory hotplug Eric DeVolder
2022-04-14 13:59 ` Borislav Petkov
2022-04-18 22:03 ` Eric DeVolder
2022-04-19 10:32 ` Borislav Petkov
2022-04-19 21:58 ` Eric DeVolder
2022-04-25 19:25 ` Borislav Petkov
2022-04-26 20:08 ` Eric DeVolder
2022-04-27 10:48 ` Borislav Petkov
2022-04-26 4:21 ` Sourabh Jain
2022-04-26 14:39 ` Eric DeVolder
2022-04-29 6:41 ` Sourabh Jain
2022-05-05 16:31 ` Eric DeVolder
2022-04-13 16:42 ` Eric DeVolder [this message]
2022-04-13 16:42 ` [PATCH v7 4/8] crash: add generic infrastructure for crash hotplug support Eric DeVolder
2022-04-14 2:45 ` Baoquan He
2022-04-14 22:29 ` Eric DeVolder
2022-04-18 3:17 ` Baoquan He
2022-04-26 4:06 ` Sourabh Jain
2022-04-26 5:22 ` Baoquan He
2022-04-28 5:18 ` Sourabh Jain
2022-05-04 18:11 ` Eric DeVolder
2022-05-05 5:45 ` Baoquan He
2022-05-05 9:59 ` Sourabh Jain
2022-05-05 11:04 ` Baoquan He
2022-05-05 13:35 ` Eric DeVolder
2022-04-13 16:42 ` [PATCH v7 5/8] kexec: exclude elfcorehdr from the segment digest Eric DeVolder
2022-04-13 16:42 ` [PATCH v7 6/8] kexec: exclude hot remove cpu from elfcorehdr notes Eric DeVolder
2022-04-14 2:48 ` Baoquan He
2022-04-14 22:31 ` Eric DeVolder
2022-04-13 16:42 ` [PATCH v7 7/8] x86/crash: Add x86 crash hotplug support for kexec_file_load Eric DeVolder
2022-04-14 2:52 ` Baoquan He
2022-04-14 22:32 ` Eric DeVolder
2022-04-13 16:42 ` [PATCH v7 8/8] x86/crash: Add x86 crash hotplug support for kexec_load Eric DeVolder
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=20220413164237.20845-4-eric.devolder@oracle.com \
--to=eric.devolder@oracle.com \
--cc=bhe@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=kexec@lists.infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nramas@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=rppt@kernel.org \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=vgoyal@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).