From: Ludwig Rydberg <ludwig.rydberg@gaisler.com>
To: Andreas Larsson <andreas@gaisler.com>,
"David S. Miller" <davem@davemloft.net>,
Kees Cook <kees@kernel.org>,
sparclinux@vger.kernel.org
Cc: Andy Lutomirski <luto@amacapital.net>,
Will Drewry <wad@chromium.org>, Oleg Nesterov <oleg@redhat.com>,
Shuah Khan <shuah@kernel.org>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Stian Halseth <stian@itx.no>,
Ludwig Rydberg <ludwig.rydberg@gaisler.com>
Subject: [PATCH 1/3] sparc32: Split common syscall_trace() to syscall_trace_{enter|leave}()
Date: Wed, 14 Oct 2026 10:07:28 +0200 [thread overview]
Message-ID: <20261014080730.8817-2-ludwig.rydberg@gaisler.com> (raw)
In-Reply-To: <20261014080730.8817-1-ludwig.rydberg@gaisler.com>
Drop the common syscall_trace() function and follow the pattern
that many other archs (including SPARC64) by having two explicit
functions called syscall_trace_{enter|leave}() instead.
Signed-off-by: Ludwig Rydberg <ludwig.rydberg@gaisler.com>
---
arch/sparc/kernel/entry.S | 21 +++++++++------------
arch/sparc/kernel/kernel.h | 3 ++-
arch/sparc/kernel/ptrace_32.c | 19 ++++++++++---------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index ea51ef52c952..7218208e0a65 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -825,8 +825,8 @@ sys_sigreturn:
be 1f
nop
- call syscall_trace
- mov 1, %o1
+ call syscall_trace_leave
+ nop
1:
/* We don't want to muck with user registers like a
@@ -845,9 +845,8 @@ sys_rt_sigreturn:
be 1f
nop
- add %sp, STACKFRAME_SZ, %o0
- call syscall_trace
- mov 1, %o1
+ call syscall_trace_leave
+ add %sp, STACKFRAME_SZ, %o0
1:
/* We are returning to a signal handler. */
@@ -929,9 +928,8 @@ linux_sparc_ni_syscall:
or %l7, %lo(sys_ni_syscall), %l7
linux_syscall_trace:
- add %sp, STACKFRAME_SZ, %o0
- call syscall_trace
- mov 0, %o1
+ call syscall_trace_enter
+ add %sp, STACKFRAME_SZ, %o0
cmp %o0, 0
bne 3f
mov -ENOSYS, %o0
@@ -1050,10 +1048,9 @@ ret_sys_call:
st %l2, [%sp + STACKFRAME_SZ + PT_NPC]
linux_syscall_trace2:
- add %sp, STACKFRAME_SZ, %o0
- mov 1, %o1
- call syscall_trace
- add %l1, 0x4, %l2 /* npc = npc+4 */
+ call syscall_trace_leave
+ add %sp, STACKFRAME_SZ, %o0
+ add %l1, 0x4, %l2 /* npc = npc+4 */
st %l1, [%sp + STACKFRAME_SZ + PT_PC]
b ret_trap_entry
st %l2, [%sp + STACKFRAME_SZ + PT_NPC]
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 4ee85051521a..e215157d5120 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -172,7 +172,8 @@ asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,
unsigned long sp);
/* ptrace_32.c */
-asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p);
+asmlinkage int syscall_trace_enter(struct pt_regs *regs);
+asmlinkage void syscall_trace_leave(struct pt_regs *regs);
/* unaligned_32.c */
asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn);
diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
index 5991b1731fee..3cd3a31ce677 100644
--- a/arch/sparc/kernel/ptrace_32.c
+++ b/arch/sparc/kernel/ptrace_32.c
@@ -433,16 +433,17 @@ long arch_ptrace(struct task_struct *child, long request,
return ret;
}
-asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)
+asmlinkage int syscall_trace_enter(struct pt_regs *regs)
{
- int ret = 0;
+ if (test_thread_flag(TIF_SYSCALL_TRACE) &&
+ !ptrace_report_syscall_permit_entry(regs))
+ return 1;
- if (test_thread_flag(TIF_SYSCALL_TRACE)) {
- if (syscall_exit_p)
- ptrace_report_syscall_exit(regs, 0);
- else
- ret = !ptrace_report_syscall_permit_entry(regs);
- }
+ return 0;
+}
- return ret;
+asmlinkage void syscall_trace_leave(struct pt_regs *regs)
+{
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
+ ptrace_report_syscall_exit(regs, 0);
}
--
2.35.3
next prev parent reply other threads:[~2026-10-14 8:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 8:07 [PATCH 0/3] sparc32: add seccomp filter support Ludwig Rydberg
2026-10-14 8:07 ` Ludwig Rydberg [this message]
2026-10-14 8:07 ` [PATCH 2/3] " Ludwig Rydberg
2026-10-14 8:07 ` [PATCH 3/3] selftests/seccomp: add sparc32 support Ludwig Rydberg
2026-10-14 9:29 ` Stian Halseth
2026-10-14 16:40 ` Kees Cook
2026-10-14 16:36 ` [PATCH 0/3] sparc32: add seccomp filter support Magnus Lindholm
2026-10-16 14:25 ` Andreas Larsson
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=20261014080730.8817-2-ludwig.rydberg@gaisler.com \
--to=ludwig.rydberg@gaisler.com \
--cc=andreas@gaisler.com \
--cc=davem@davemloft.net \
--cc=glaubitz@physik.fu-berlin.de \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=oleg@redhat.com \
--cc=shuah@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=stian@itx.no \
--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®