From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, james.morse@arm.com, joey.gouly@arm.com,
mark.rutland@arm.com, maz@kernel.org, will@kernel.org
Subject: [PATCH v3 10/20] arm64: entry: consolidate EL1 exception returns
Date: Tue, 25 May 2021 19:32:52 +0100 [thread overview]
Message-ID: <20210525183302.56293-11-mark.rutland@arm.com> (raw)
In-Reply-To: <20210525183302.56293-1-mark.rutland@arm.com>
Following the example of ret_to_user, let's consolidate all the EL1
return paths with a ret_to_kernel helper, rather than each entry point
having its own copy of the return code.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Joey Gouly <joey.gouly@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
---
arch/arm64/kernel/entry.S | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index dd5319ade2db..cab4c284c106 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -612,7 +612,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_sync)
kernel_entry 1
mov x0, sp
bl el1_sync_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_sync)
.align 6
@@ -620,7 +620,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_irq)
kernel_entry 1
mov x0, sp
bl el1_irq_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_irq)
.align 6
@@ -628,7 +628,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_fiq)
kernel_entry 1
mov x0, sp
bl el1_fiq_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_fiq)
.align 6
@@ -636,9 +636,13 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_error)
kernel_entry 1
mov x0, sp
bl el1_error_handler
- kernel_exit 1
+ b ret_to_kernel
SYM_CODE_END(el1_error)
+SYM_CODE_START_LOCAL(ret_to_kernel)
+ kernel_exit 1
+SYM_CODE_END(ret_to_kernel)
+
/*
* EL0 mode handlers.
*/
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-25 18:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 18:32 [PATCH v3 00/20] arm64: entry: migrate more code to C Mark Rutland
2021-05-25 18:32 ` [PATCH v3 01/20] arm64: remove redundant local_daif_mask() in bad_mode() Mark Rutland
2021-05-27 12:34 ` Marc Zyngier
2021-05-25 18:32 ` [PATCH v3 02/20] arm64: entry: unmask IRQ+FIQ after EL0 handling Mark Rutland
2021-06-04 16:47 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 03/20] arm64: entry: convert SError handlers to C Mark Rutland
2021-05-25 18:32 ` [PATCH v3 04/20] arm64: entry: move arm64_preempt_schedule_irq to entry-common.c Mark Rutland
2021-05-25 18:32 ` [PATCH v3 05/20] arm64: entry: move preempt logic to C Mark Rutland
2021-06-04 15:43 ` Will Deacon
2021-06-04 16:54 ` Mark Rutland
2021-05-25 18:32 ` [PATCH v3 06/20] arm64: entry: add a call_on_irq_stack helper Mark Rutland
2021-05-25 18:32 ` [PATCH v3 07/20] arm64: entry: convert IRQ+FIQ handlers to C Mark Rutland
2021-05-25 18:32 ` [PATCH v3 08/20] arm64: entry: organise entry handlers consistently Mark Rutland
2021-06-04 16:51 ` Will Deacon
2021-06-04 17:39 ` Mark Rutland
2021-06-04 17:44 ` Will Deacon
2021-06-04 18:01 ` Mark Rutland
2021-05-25 18:32 ` [PATCH v3 09/20] arm64: entry: organise entry vectors consistently Mark Rutland
2021-05-25 18:32 ` Mark Rutland [this message]
2021-05-25 18:32 ` [PATCH v3 11/20] arm64: entry: move bad_mode() to entry-common.c Mark Rutland
2021-06-04 16:57 ` Will Deacon
2021-06-04 17:42 ` Mark Rutland
2021-06-04 17:43 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 12/20] arm64: entry: improve bad_mode() Mark Rutland
2021-05-25 18:32 ` [PATCH v3 13/20] arm64: entry: template the entry asm functions Mark Rutland
2021-05-25 18:32 ` [PATCH v3 14/20] arm64: entry: handle all vectors with C Mark Rutland
2021-06-04 17:13 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 15/20] arm64: entry: fold el1_inv() into el1h_64_sync_handler() Mark Rutland
2021-05-25 18:32 ` [PATCH v3 16/20] arm64: entry: split bad stack entry Mark Rutland
2021-05-25 18:32 ` [PATCH v3 17/20] arm64: entry: split SDEI entry Mark Rutland
2021-05-25 18:33 ` [PATCH v3 18/20] arm64: entry: make NMI entry/exit functions static Mark Rutland
2021-05-25 18:33 ` [PATCH v3 19/20] arm64: entry: don't instrument entry code with KCOV Mark Rutland
2021-06-04 17:16 ` Will Deacon
2021-06-04 17:49 ` Mark Rutland
2021-05-25 18:33 ` [PATCH v3 20/20] arm64: idle: don't instrument idle " Mark Rutland
2021-05-27 14:06 ` [PATCH v3 00/20] arm64: entry: migrate more code to C Catalin Marinas
2021-05-27 15:31 ` Marc Zyngier
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=20210525183302.56293-11-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--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).