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,
kernelfans@gmail.com
Subject: [PATCH v13 02/18] arm64: hyp-stub: Move invalid vector entries into the vectors
Date: Thu, 8 Apr 2021 00:05:21 -0400 [thread overview]
Message-ID: <20210408040537.2703241-3-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20210408040537.2703241-1-pasha.tatashin@soleen.com>
From: James Morse <james.morse@arm.com>
Most of the hyp-stub's vector entries are invalid. These are each
a unique function that branches to itself. To move these into the
vectors, merge the ventry and invalid_vector macros and give each
one a unique name.
This means we can copy the hyp-stub as it is self contained within
its vectors.
Signed-off-by: James Morse <james.morse@arm.com>
[Fixed merging issues]
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
arch/arm64/kernel/hyp-stub.S | 56 +++++++++++++++---------------------
1 file changed, 23 insertions(+), 33 deletions(-)
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 572b28646005..ff329c5c074d 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -16,31 +16,38 @@
#include <asm/ptrace.h>
#include <asm/virt.h>
+.macro invalid_vector label
+SYM_CODE_START_LOCAL(\label)
+ .align 7
+ b \label
+SYM_CODE_END(\label)
+.endm
+
.text
.pushsection .hyp.text, "ax"
.align 11
SYM_CODE_START(__hyp_stub_vectors)
- ventry el2_sync_invalid // Synchronous EL2t
- ventry el2_irq_invalid // IRQ EL2t
- ventry el2_fiq_invalid // FIQ EL2t
- ventry el2_error_invalid // Error EL2t
+ invalid_vector hyp_stub_el2t_sync_invalid // Synchronous EL2t
+ invalid_vector hyp_stub_el2t_irq_invalid // IRQ EL2t
+ invalid_vector hyp_stub_el2t_fiq_invalid // FIQ EL2t
+ invalid_vector hyp_stub_el2t_error_invalid // Error EL2t
- ventry el2_sync_invalid // Synchronous EL2h
- ventry el2_irq_invalid // IRQ EL2h
- ventry el2_fiq_invalid // FIQ EL2h
- ventry el2_error_invalid // Error EL2h
+ invalid_vector hyp_stub_el2h_sync_invalid // Synchronous EL2h
+ invalid_vector hyp_stub_el2h_irq_invalid // IRQ EL2h
+ invalid_vector hyp_stub_el2h_fiq_invalid // FIQ EL2h
+ invalid_vector hyp_stub_el2h_error_invalid // Error EL2h
ventry el1_sync // Synchronous 64-bit EL1
- ventry el1_irq_invalid // IRQ 64-bit EL1
- ventry el1_fiq_invalid // FIQ 64-bit EL1
- ventry el1_error_invalid // Error 64-bit EL1
-
- ventry el1_sync_invalid // Synchronous 32-bit EL1
- ventry el1_irq_invalid // IRQ 32-bit EL1
- ventry el1_fiq_invalid // FIQ 32-bit EL1
- ventry el1_error_invalid // Error 32-bit EL1
+ invalid_vector hyp_stub_el1_irq_invalid // IRQ 64-bit EL1
+ invalid_vector hyp_stub_el1_fiq_invalid // FIQ 64-bit EL1
+ invalid_vector hyp_stub_el1_error_invalid // Error 64-bit EL1
+
+ invalid_vector hyp_stub_32b_el1_sync_invalid // Synchronous 32-bit EL1
+ invalid_vector hyp_stub_32b_el1_irq_invalid // IRQ 32-bit EL1
+ invalid_vector hyp_stub_32b_el1_fiq_invalid // FIQ 32-bit EL1
+ invalid_vector hyp_stub_32b_el1_error_invalid // Error 32-bit EL1
.align 11
SYM_INNER_LABEL(__hyp_stub_vectors_end, SYM_L_LOCAL)
SYM_CODE_END(__hyp_stub_vectors)
@@ -173,23 +180,6 @@ SYM_CODE_END(enter_vhe)
.popsection
-.macro invalid_vector label
-SYM_CODE_START_LOCAL(\label)
- b \label
-SYM_CODE_END(\label)
-.endm
-
- invalid_vector el2_sync_invalid
- invalid_vector el2_irq_invalid
- invalid_vector el2_fiq_invalid
- invalid_vector el2_error_invalid
- invalid_vector el1_sync_invalid
- invalid_vector el1_irq_invalid
- invalid_vector el1_fiq_invalid
- invalid_vector el1_error_invalid
-
- .popsection
-
/*
* __hyp_set_vectors: Call this after boot to set the initial hypervisor
* vectors as part of hypervisor installation. On an SMP system, this should
--
2.25.1
next prev parent reply other threads:[~2021-04-08 4:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 4:05 [PATCH v13 00/18] arm64: MMU enabled kexec relocation Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 01/18] arm64: hyp-stub: Check the size of the HYP stub's vectors Pavel Tatashin
2021-04-08 4:05 ` Pavel Tatashin [this message]
2021-04-08 4:05 ` [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync into the vectors Pavel Tatashin
2021-04-08 10:24 ` Marc Zyngier
2021-04-08 14:45 ` Pavel Tatashin
2021-04-08 15:01 ` Marc Zyngier
2021-04-08 16:28 ` Pavel Tatashin
2021-04-26 18:10 ` Pavel Tatashin
2021-04-26 18:11 ` Pavel Tatashin
2021-04-26 18:24 ` Marc Zyngier
2021-04-08 4:05 ` [PATCH v13 04/18] arm64: kernel: add helper for booted at EL2 and not VHE Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 05/18] arm64: trans_pgd: hibernate: Add trans_pgd_copy_el2_vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 06/18] arm64: hibernate: abstract ttrb0 setup function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 07/18] arm64: kexec: flush image and lists during kexec load time Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 08/18] arm64: kexec: skip relocation code for inplace kexec Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 09/18] arm64: kexec: Use dcache ops macros instead of open-coding Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 10/18] arm64: kexec: pass kimage as the only argument to relocation function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 11/18] arm64: kexec: kexec may require EL2 vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 12/18] arm64: kexec: relocate in EL1 mode Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 13/18] arm64: kexec: use ld script for relocation function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 14/18] arm64: kexec: install a copy of the linear-map Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 15/18] arm64: kexec: keep MMU enabled during kexec relocation Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 16/18] arm64: kexec: remove the pre-kexec PoC maintenance Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 17/18] arm64: kexec: Remove cpu-reset.h Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 18/18] arm64/mm: remove useless trans_pgd_map_page() 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=20210408040537.2703241-3-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=kernelfans@gmail.com \
--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).