From: Linus Walleij <linus.walleij@linaro.org>
To: Dmitry Vyukov <dvyukov@google.com>,
Oleg Nesterov <oleg@redhat.com>,
Russell King <linux@armlinux.org.uk>,
Kees Cook <kees@kernel.org>,
Andy Lutomirski <luto@amacapital.net>,
Will Drewry <wad@chromium.org>,
Frederic Weisbecker <frederic@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Jinjie Ruan <ruanjinjie@huawei.com>,
Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH RFC v3 14/30] ARM: entry: Drop trace argument from usr_entry macro
Date: Tue, 07 Jan 2025 10:41:30 +0100 [thread overview]
Message-ID: <20250107-arm-generic-entry-v3-14-4e5f3c15db2d@linaro.org> (raw)
In-Reply-To: <20250107-arm-generic-entry-v3-0-4e5f3c15db2d@linaro.org>
The trace argument select whether to look into tracing of
the hardirqs for the exceptions from userspace, but also
selects whether to call further down to establish context
for RCU.
Split off a second macro that is called on everything
except the FIQ since this is the only outlier.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/kernel/entry-armv.S | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 93a37437a9520118eff411f009e8f6bd729412fc..c71110126fc105fc6ac2d6cb0f5f399b4c8b1548 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -357,7 +357,7 @@ ENDPROC(__fiq_abt)
#error "sizeof(struct pt_regs) must be a multiple of 8"
#endif
- .macro usr_entry, trace=1, uaccess=1
+ .macro usr_entry, uaccess=1
UNWIND(.fnstart )
UNWIND(.cantunwind ) @ don't unwind the user space
sub sp, sp, #PT_REGS_SIZE
@@ -401,13 +401,14 @@ ENDPROC(__fiq_abt)
@ Clear FP to mark the first stack frame
@
zero_fp
+ .endm
- .if \trace
+ /* Called after usr_entry for everything except FIQ */
+ .macro usr_entry_enter
#ifdef CONFIG_TRACE_IRQFLAGS
bl trace_hardirqs_off
#endif
asm_irqentry_enter_from_user_mode save = 0
- .endif
.endm
.macro kuser_cmpxchg_check
@@ -429,6 +430,7 @@ ENDPROC(__fiq_abt)
.align 5
__dabt_usr:
usr_entry uaccess=0
+ usr_entry_enter
kuser_cmpxchg_check
mov r2, sp
dabt_helper
@@ -439,6 +441,7 @@ ENDPROC(__dabt_usr)
.align 5
__irq_usr:
usr_entry
+ usr_entry_enter
kuser_cmpxchg_check
irq_handler from_user=1
get_thread_info tsk
@@ -452,6 +455,7 @@ ENDPROC(__irq_usr)
.align 5
__und_usr:
usr_entry uaccess=0
+ usr_entry_enter
@ IRQs must be enabled before attempting to read the instruction from
@ user space since that could cause a page/translation fault if the
@@ -476,6 +480,7 @@ ENDPROC(__und_usr)
.align 5
__pabt_usr:
usr_entry
+ usr_entry_enter
mov r2, sp @ regs
pabt_helper
UNWIND(.fnend )
@@ -495,7 +500,7 @@ ENDPROC(ret_from_exception)
.align 5
__fiq_usr:
- usr_entry trace=0
+ usr_entry
kuser_cmpxchg_check
mov r0, sp @ struct pt_regs *regs
bl handle_fiq_as_nmi
--
2.47.1
next prev parent reply other threads:[~2025-01-07 9:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 9:41 [PATCH RFC v3 00/30] ARM: Switch to generic entry Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 01/30] ARM: Prepare includes for " Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 02/30] ARM: ptrace: Split report_syscall() Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 03/30] ARM: entry: Skip ret_slow_syscall label Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 04/30] ARM: process: Rewrite ret_from_fork i C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 05/30] ARM: process: Remove local restart Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 06/30] ARM: entry: Invoke syscalls using C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 07/30] ARM: entry: Rewrite two asm calls in C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 08/30] ARM: entry: Move trace entry to C function Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 09/30] ARM: entry: save the syscall sp in thread_info Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 10/30] ARM: entry: move all tracing invocation to C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 11/30] ARM: entry: Merge the common and trace entry code Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 12/30] ARM: entry: Rename syscall invocation Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 13/30] ARM: entry: Create user_mode_enter/exit Linus Walleij
2025-01-07 9:41 ` Linus Walleij [this message]
2025-01-07 9:41 ` [PATCH RFC v3 15/30] ARM: entry: Separate call path for syscall SWI entry Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 16/30] ARM: entry: Drop argument to asm_irqentry macros Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 17/30] ARM: entry: Implement syscall_exit_to_user_mode() Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 18/30] ARM: entry: Drop the superfast ret_fast_syscall Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 19/30] ARM: entry: Remove fast and offset register restore Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 20/30] ARM: entry: Untangle ret_fast_syscall/to_user Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 21/30] ARM: entry: Do not double-call exit functions Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 22/30] ARM: entry: Move work processing to C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 23/30] ARM: entry: Stop exiting syscalls like IRQs Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 24/30] ARM: entry: Complete syscall and IRQ transition to C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 25/30] ARM: entry: Create irqentry calls from kernel mode Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 26/30] ARM: entry: Move in-kernel hardirq tracing to C Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 27/30] ARM: irq: Add irqstack helpers Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 28/30] ARM: entry: Convert to generic entry Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 29/30] ARM: entry: Handle prefetch and data aborts as interrupts Linus Walleij
2025-01-07 9:41 ` [PATCH RFC v3 30/30] RFC: ARM: entry: Block IRQs in early IRQ context Linus Walleij
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=20250107-arm-generic-entry-v3-14-4e5f3c15db2d@linaro.org \
--to=linus.walleij@linaro.org \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=dvyukov@google.com \
--cc=frederic@kernel.org \
--cc=kees@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luto@amacapital.net \
--cc=oleg@redhat.com \
--cc=paulmck@kernel.org \
--cc=ruanjinjie@huawei.com \
--cc=viro@zeniv.linux.org.uk \
--cc=wad@chromium.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
all inboxes | Powered by JetHome®