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>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH v6 03/31] ARM: entry: Skip ret_slow_syscall label
Date: Sun, 20 Apr 2025 00:35:50 +0200 [thread overview]
Message-ID: <20250420-arm-generic-entry-v6-3-95f1fcdfeeb2@linaro.org> (raw)
In-Reply-To: <20250420-arm-generic-entry-v6-0-95f1fcdfeeb2@linaro.org>
Don't introduce this extra label anymore now that we have
a clearly defined entry point for ret_to_user.
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/kernel/entry-common.S | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index f379c852dcb72fa5e960bba5621cc2152f0df0d3..2f93c2f6d5b8fdf6aaf3dda0192bde144fcf238d 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -102,7 +102,6 @@ ENDPROC(ret_fast_syscall)
* do_work_pending() will update this state if necessary.
*/
ENTRY(ret_to_user)
-ret_slow_syscall:
#if IS_ENABLED(CONFIG_DEBUG_RSEQ)
/* do_rseq_syscall needs interrupts enabled. */
enable_irq_notrace @ enable interrupts
@@ -136,7 +135,7 @@ ENTRY(ret_from_fork)
badrne lr, 1f
retne r5
1: get_thread_info tsk
- b ret_slow_syscall
+ b ret_to_user
ENDPROC(ret_from_fork)
/*=============================================================================
@@ -310,13 +309,13 @@ __sys_trace_return_nosave:
enable_irq_notrace
mov r0, sp
bl syscall_trace_exit
- b ret_slow_syscall
+ b ret_to_user
__sys_trace_return:
str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
mov r0, sp
bl syscall_trace_exit
- b ret_slow_syscall
+ b ret_to_user
.macro syscall_table_start, sym
.equ __sys_nr, 0
--
2.49.0
next prev parent reply other threads:[~2025-04-19 22:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-19 22:35 [PATCH v6 00/31] ARM: Switch to generic entry Linus Walleij
2025-04-19 22:35 ` [PATCH v6 01/31] ARM: Prepare includes for " Linus Walleij
2025-04-19 22:35 ` [PATCH v6 02/31] ARM: ptrace: Split report_syscall() Linus Walleij
2025-04-19 22:35 ` Linus Walleij [this message]
2025-04-19 22:35 ` [PATCH v6 04/31] ARM: process: Rewrite ret_from_fork i C Linus Walleij
2025-04-19 22:35 ` [PATCH v6 05/31] ARM: process: Remove local restart Linus Walleij
2025-04-19 22:35 ` [PATCH v6 06/31] ARM: entry: Invoke syscalls using C Linus Walleij
2025-04-19 22:35 ` [PATCH v6 07/31] ARM: entry: Rewrite two asm calls in C Linus Walleij
2025-04-19 22:35 ` [PATCH v6 08/31] ARM: entry: Move trace entry to C function Linus Walleij
2025-04-19 22:35 ` [PATCH v6 09/31] ARM: entry: save the syscall sp in thread_info Linus Walleij
2025-04-19 22:35 ` [PATCH v6 10/31] ARM: entry: move all tracing invocation to C Linus Walleij
2025-04-19 22:35 ` [PATCH v6 11/31] ARM: entry: Merge the common and trace entry code Linus Walleij
2025-04-19 22:35 ` [PATCH v6 12/31] ARM: entry: Rename syscall invocation Linus Walleij
2025-04-19 22:36 ` [PATCH v6 13/31] ARM: entry: Create user_mode_enter/exit Linus Walleij
2025-04-19 22:36 ` [PATCH v6 14/31] ARM: entry: Drop trace argument from usr_entry macro Linus Walleij
2025-04-19 22:36 ` [PATCH v6 15/31] ARM: entry: Separate call path for syscall SWI entry Linus Walleij
2025-04-19 22:36 ` [PATCH v6 16/31] ARM: entry: Drop argument to asm_irqentry macros Linus Walleij
2025-04-19 22:36 ` [PATCH v6 17/31] ARM: entry: Implement syscall_exit_to_user_mode() Linus Walleij
2025-04-19 22:36 ` [PATCH v6 18/31] ARM: entry: Drop the superfast ret_fast_syscall Linus Walleij
2025-04-19 22:36 ` [PATCH v6 19/31] ARM: entry: Remove fast and offset register restore Linus Walleij
2025-04-19 22:36 ` [PATCH v6 20/31] ARM: entry: Untangle ret_fast_syscall/to_user Linus Walleij
2025-04-19 22:36 ` [PATCH v6 21/31] ARM: entry: Do not double-call exit functions Linus Walleij
2025-04-19 22:36 ` [PATCH v6 22/31] ARM: entry: Move work processing to C Linus Walleij
2025-04-19 22:36 ` [PATCH v6 23/31] ARM: entry: Stop exiting syscalls like IRQs Linus Walleij
2025-04-19 22:36 ` [PATCH v6 24/31] ARM: entry: Complete syscall and IRQ transition to C Linus Walleij
2025-04-19 22:36 ` [PATCH v6 25/31] ARM: entry: Create irqentry calls from kernel mode Linus Walleij
2025-04-19 22:36 ` [PATCH v6 26/31] ARM: entry: Move in-kernel hardirq tracing to C Linus Walleij
2025-04-19 22:36 ` [PATCH v6 27/31] ARM: irq: Add irqstack helper Linus Walleij
2025-04-19 22:36 ` [PATCH v6 28/31] ARM: entry: Convert to generic entry Linus Walleij
2025-04-19 22:36 ` [PATCH v6 29/31] ARM: entry: Handle dabt, pabt, and und as interrupts Linus Walleij
2025-04-19 22:36 ` [PATCH v6 30/31] ARM: entry: Block IRQs in early IRQ context Linus Walleij
2025-04-19 22:36 ` [PATCH v6 31/31] ARM: entry: Reimplement local restart in C 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=20250420-arm-generic-entry-v6-3-95f1fcdfeeb2@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=tglx@linutronix.de \
--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®