From: Linus Walleij <linus.walleij@linaro.org>
To: 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 v2 08/28] ARM: entry: Move trace entry to C function
Date: Tue, 29 Oct 2024 11:52:48 +0100 [thread overview]
Message-ID: <20241029-arm-generic-entry-v2-8-573519abef38@linaro.org> (raw)
In-Reply-To: <20241029-arm-generic-entry-v2-0-573519abef38@linaro.org>
This moves over the code entering into tracing into the
C syscall invocation code. As syscall_trace_enter() will
provide the current syscall number from the regs we need
not provide the syscall number to the invocation function
any more.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/include/asm/syscall.h | 2 +-
arch/arm/kernel/entry-common.S | 6 +-----
arch/arm/kernel/syscall.c | 5 ++++-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
index 1d21f26ecf51..66067d165ba3 100644
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -20,7 +20,7 @@
extern const unsigned long sys_call_table[];
int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *retp);
-int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno, void *retp);
+int invoke_syscall_trace(void *table, struct pt_regs *regs, void *retp);
static inline int syscall_get_nr(struct task_struct *task,
struct pt_regs *regs)
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 77801d039b5f..3cfc6d952ff9 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -292,13 +292,9 @@ ENDPROC(vector_swi)
* context switches, and waiting for our parent to respond.
*/
__sys_trace:
- add r0, sp, #S_OFF
- bl syscall_trace_enter
- mov scno, r0
- mov r2, r0 @ scno into r2
add r1, sp, #S_R0 + S_OFF @ pointer to regs
mov r0, tbl
- badr r3, __sys_trace_return
+ badr r2, __sys_trace_return
bl invoke_syscall_trace
cmp r0, #-1
bne __sys_trace_return
diff --git a/arch/arm/kernel/syscall.c b/arch/arm/kernel/syscall.c
index d1259c6d2805..815312f7b254 100644
--- a/arch/arm/kernel/syscall.c
+++ b/arch/arm/kernel/syscall.c
@@ -19,8 +19,11 @@ __visible int invoke_syscall(void *table, struct pt_regs *regs, int scno, void *
int invoke_syscall_trace_asm(void *table, struct pt_regs *regs, int scno, void *retp);
-__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, int scno, void *retp)
+__visible int invoke_syscall_trace(void *table, struct pt_regs *regs, void *retp)
{
+ int scno;
+
+ scno = syscall_trace_enter(regs);
if (scno == -1)
return -1;
--
2.46.2
next prev parent reply other threads:[~2024-10-29 10:53 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 10:52 [PATCH RFC v2 00/28] ARM: Switch to generic entry Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 01/28] ARM: Prepare includes for " Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 02/28] ARM: ptrace: Split report_syscall() Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 03/28] ARM: entry: Skip ret_slow_syscall label Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 04/28] ARM: process: Rewrite ret_from_fork i C Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 05/28] ARM: process: Remove local restart Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 06/28] ARM: entry: Invoke syscalls using C Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 07/28] ARM: entry: Rewrite two asm calls in C Linus Walleij
2024-10-29 10:52 ` Linus Walleij [this message]
2024-10-29 10:52 ` [PATCH RFC v2 09/28] ARM: entry: save the syscall sp in thread_info Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 10/28] ARM: entry: move all tracing invocation to C Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 11/28] ARM: entry: Merge the common and trace entry code Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 12/28] ARM: entry: Rename syscall invocation Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 13/28] ARM: entry: Create user_mode_enter/exit Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 14/28] ARM: entry: Drop trace argument from usr_entry macro Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 15/28] ARM: entry: Separate call path for syscall SWI entry Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 16/28] ARM: entry: Drop argument to asm_irqentry macros Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 17/28] ARM: entry: Implement syscall_exit_to_user_mode() Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 18/28] ARM: entry: Drop the superfast ret_fast_syscall Linus Walleij
2024-10-29 10:52 ` [PATCH RFC v2 19/28] ARM: entry: Remove fast and offset register restore Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 20/28] ARM: entry: Untangle ret_fast_syscall/to_user Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 21/28] ARM: entry: Do not double-call exit functions Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 22/28] ARM: entry: Move work processing to C Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 23/28] ARM: entry: Stop exiting syscalls like IRQs Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 24/28] ARM: entry: Complete syscall and IRQ transition to C Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 25/28] ARM: entry: Create irqentry calls from kernel mode Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 26/28] ARM: entry: Move in-kernel hardirq tracing to C Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 27/28] ARM: entry: Add FIQ/NMI C callbacks Linus Walleij
2024-10-29 10:53 ` [PATCH RFC v2 28/28] ARM: entry: Convert to generic entry 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=20241029-arm-generic-entry-v2-8-573519abef38@linaro.org \
--to=linus.walleij@linaro.org \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--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®