From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org,
ebiederm@xmission.com, kexec@lists.infradead.org,
linux-kernel@vger.kernel.org, corbet@lwn.net,
catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org, maz@kernel.org,
james.morse@arm.com, vladimir.murzin@arm.com,
matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com,
steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de,
selindag@gmail.com, tyhicks@linux.microsoft.com
Subject: [PATCH v10 18/18] arm64: kexec: remove head from relocation argument
Date: Mon, 25 Jan 2021 14:19:23 -0500 [thread overview]
Message-ID: <20210125191923.1060122-19-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20210125191923.1060122-1-pasha.tatashin@soleen.com>
Now, that relocation is done using virtual addresses, reloc_arg->head
is not needed anymore.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
arch/arm64/include/asm/kexec.h | 2 --
arch/arm64/kernel/asm-offsets.c | 1 -
arch/arm64/kernel/machine_kexec.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 049cde429b1b..2fa4109bd582 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -97,7 +97,6 @@ extern const char arm64_kexec_el2_vectors[];
/*
* kern_reloc_arg is passed to kernel relocation function as an argument.
- * head kimage->head, allows to traverse through relocation segments.
* entry_addr kimage->start, where to jump from relocation function (new
* kernel, or purgatory entry address).
* kern_arg0 first argument to kernel is its dtb address. The other
@@ -113,7 +112,6 @@ extern const char arm64_kexec_el2_vectors[];
* copy_len Number of bytes that need to be copied
*/
struct kern_reloc_arg {
- phys_addr_t head;
phys_addr_t entry_addr;
phys_addr_t kern_arg0;
phys_addr_t kern_arg1;
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 06278611451d..94f050ad6471 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -153,7 +153,6 @@ int main(void)
BLANK();
#endif
#ifdef CONFIG_KEXEC_CORE
- DEFINE(KEXEC_KRELOC_HEAD, offsetof(struct kern_reloc_arg, head));
DEFINE(KEXEC_KRELOC_ENTRY_ADDR, offsetof(struct kern_reloc_arg, entry_addr));
DEFINE(KEXEC_KRELOC_KERN_ARG0, offsetof(struct kern_reloc_arg, kern_arg0));
DEFINE(KEXEC_KRELOC_KERN_ARG1, offsetof(struct kern_reloc_arg, kern_arg1));
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index dc1b7e5a54fb..c2dff232a85b 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -168,7 +168,6 @@ int machine_kexec_post_load(struct kimage *kimage)
memcpy(reloc_code, __relocate_new_kernel_start, reloc_size);
kimage->arch.kern_reloc = __pa(reloc_code) + func_offset;
kimage->arch.kern_reloc_arg = __pa(kern_reloc_arg);
- kern_reloc_arg->head = kimage->head;
kern_reloc_arg->entry_addr = kimage->start;
kern_reloc_arg->kern_arg0 = kimage->arch.dtb_mem;
--
2.25.1
next prev parent reply other threads:[~2021-01-25 19:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 19:19 [PATCH v10 00/18] arm64: MMU enabled kexec relocation Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 01/18] arm64: kexec: make dtb_mem always enabled Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 02/18] arm64: hibernate: variable pudp is used instead of pd4dp Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 03/18] arm64: hibernate: move page handling function to new trans_pgd.c Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 04/18] arm64: trans_pgd: make trans_pgd_map_page generic Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 05/18] arm64: trans_pgd: pass allocator trans_pgd_create_copy Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 06/18] arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 07/18] arm64: mm: Always update TCR_EL1 from __cpu_set_tcr_t0sz() Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 08/18] arm64: trans_pgd: hibernate: idmap the single page that holds the copy page routines Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 09/18] arm64: kexec: move relocation function setup Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 10/18] arm64: kexec: call kexec_image_info only once Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 11/18] arm64: kexec: arm64_relocate_new_kernel clean-ups and optimizations Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 12/18] arm64: kexec: arm64_relocate_new_kernel don't use x0 as temp Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 13/18] arm64: kexec: add expandable argument to relocation function Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 14/18] arm64: kexec: use ld script for " Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 15/18] arm64: kexec: kexec may require EL2 vectors Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 16/18] arm64: kexec: configure trans_pgd page table for kexec Pavel Tatashin
2021-01-26 0:21 ` Pavel Tatashin
2021-01-27 16:42 ` Tyler Hicks
2021-01-27 16:47 ` Pavel Tatashin
2021-01-25 19:19 ` [PATCH v10 17/18] arm64: kexec: enable MMU during kexec relocation Pavel Tatashin
2021-01-25 19:19 ` Pavel Tatashin [this message]
2021-01-26 22:58 ` [PATCH v10 00/18] arm64: MMU enabled " Will Deacon
2021-01-26 23:05 ` Pavel Tatashin
2021-01-26 23:11 ` Will Deacon
2021-01-27 15:59 ` (subset) " Will Deacon
2021-01-27 16:12 ` Pavel Tatashin
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=20210125191923.1060122-19-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=maz@kernel.org \
--cc=rfontana@redhat.com \
--cc=sashal@kernel.org \
--cc=selindag@gmail.com \
--cc=steve.capper@arm.com \
--cc=tglx@linutronix.de \
--cc=tyhicks@linux.microsoft.com \
--cc=vladimir.murzin@arm.com \
--cc=will@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).