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, marc.zyngier@arm.com,
james.morse@arm.com, vladimir.murzin@arm.com,
matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org,
mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com,
tglx@linutronix.de
Subject: [PATCH v7 25/25] arm64: kexec: remove head from relocation argument
Date: Wed, 16 Oct 2019 16:00:34 -0400 [thread overview]
Message-ID: <20191016200034.1342308-26-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20191016200034.1342308-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 df911a4aa8ce..b3a39736d0db 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -104,7 +104,6 @@ extern const unsigned long kexec_el2_vectors_offset;
/*
* 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
@@ -119,7 +118,6 @@ extern const unsigned long kexec_el2_vectors_offset;
* 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 4147d9d70c1c..4ec01f29718d 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -129,7 +129,6 @@ int main(void)
DEFINE(SDEI_EVENT_PRIORITY, offsetof(struct sdei_registered_event, priority));
#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 8edcc4be0b15..2e11194b8023 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -174,7 +174,6 @@ int machine_kexec_post_load(struct kimage *kimage)
memcpy(reloc_code, kexec_relocate_code_start, kexec_relocate_code_size);
kimage->arch.kern_reloc = __pa(reloc_code) + kexec_kern_reloc_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;
/* Setup vector table only when EL2 is available, but no VHE */
--
2.23.0
next prev parent reply other threads:[~2019-10-16 20:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 20:00 [PATCH v7 00/25] arm64: MMU enabled kexec relocation Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 01/25] kexec: quiet down kexec reboot Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 02/25] kexec: add machine_kexec_post_load() Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 03/25] arm64: kexec: remove unnecessary debug prints Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 04/25] arm64: kexec: make dtb_mem always enabled Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 05/25] arm64: hibernate: pass the allocated pgdp to ttbr0 Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 06/25] arm64: hibernate: use get_safe_page directly Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 07/25] arm64: hibernate: remove gotos as they are not needed Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 08/25] arm64: hibernate: rename dst to page in create_safe_exec_page Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 09/25] arm64: hibernate: add PUD_SECT_RDONLY Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 10/25] arm64: hibernate: add trans_pgd public functions Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 11/25] arm64: hibernate: move page handling function to new trans_pgd.c Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 12/25] arm64: trans_pgd: make trans_pgd_map_page generic Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 13/25] arm64: trans_pgd: pass allocator trans_pgd_create_copy Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 14/25] arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 15/25] arm64: kexec: move relocation function setup Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 16/25] arm64: kexec: call kexec_image_info only once Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 17/25] arm64: kexec: cpu_soft_restart change argument types Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 18/25] arm64: kexec: arm64_relocate_new_kernel clean-ups Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 19/25] arm64: kexec: arm64_relocate_new_kernel don't use x0 as temp Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 20/25] arm64: kexec: add expandable argument to relocation function Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 21/25] arm64: kexec: offset for " Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 22/25] arm64: kexec: kexec EL2 vectors Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 23/25] arm64: kexec: configure trans_pgd page table for kexec Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 24/25] arm64: kexec: enable MMU during kexec relocation Pavel Tatashin
2019-10-16 20:00 ` Pavel Tatashin [this message]
2019-10-17 14:26 ` [PATCH v7 00/25] arm64: MMU enabled " 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=20191016200034.1342308-26-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.com \
--cc=bhsharma@redhat.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=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=rfontana@redhat.com \
--cc=sashal@kernel.org \
--cc=steve.capper@arm.com \
--cc=tglx@linutronix.de \
--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