riscv: Remove unnecessary path for syscall_trace
PATCH 1/1 riscv: Remove unnecessary path for syscall_trace
From: Guo Ren <[email protected]>
Obviously, there is no need to recover a0-a7 in reject path.
Previous modification is from commit af33d243 by Tycho, to fixup seccomp reject syscall code path.
--- arch/riscv/kernel/entry.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/riscv/kernel/entry.S +1 -2
@@ -306,7 +306,7 @@ work_resched: handle_syscall_trace_enter: move a0, sp call do_syscall_trace_enter - move t0, a0 + bnez a0, ret_from_syscall_rejected REG_L a0, PT_A0(sp) REG_L a1, PT_A1(sp) REG_L a2, PT_A2(sp)
@@ -315,7 +315,6 @@ handle_syscall_trace_enter: REG_L a5, PT_A5(sp) REG_L a6, PT_A6(sp) REG_L a7, PT_A7(sp) - bnez t0, ret_from_syscall_rejected j check_syscall_nr handle_syscall_trace_exit: move a0, sp
Signature · 1 line
2.7.4
Quoted 6 lines · On Mon, May 25, 2020 at 02:18:26PM +0000, [email protected] wrote:
From: Guo Ren <[email protected]>
Obviously, there is no need to recover a0-a7 in reject path.
Previous modification is from commit
af33d243by Tycho, to fixup seccomp reject syscall code path.
Doesn't this suffer from the same problem, though? a7 is clobbered, so the -ERESTARTSYS behavior won't work?
I haven't run the test case that was failing before.
Tycho
Hi Tycho,
Quoted 11 lines · Tycho Andersen
Quoted 6 lines · On Mon, May 25, 2020 at 02:18:26PM +0000, [email protected] wrote:
From: Guo Ren <[email protected]>
Obviously, there is no need to recover a0-a7 in reject path.
Previous modification is from commit
af33d243by Tycho, to fixup seccomp reject syscall code path.Doesn't this suffer from the same problem, though? a7 is clobbered, so the
-ERESTARTSYSbehavior won't work?
Look, the patch only affects the path of ret_from_syscall_rejected, and there are two possible paths:
1. ret_from_syscall_rejected->handle_syscall_trace_exit->ret_from_exception
2. ret_from_syscall_rejected->ret_from_exception
All the above skip the check_syscall_nr and ignore the current a7, in the C function they use the pt_regs in the stack to get proper reg's value.
For the -ERESTARTSYS, we only process it in:ret_from_exception->resume_userspace->work_notifysig->do_notify_resume:do_signal & handle_signal:
switch (regs->a0) {
case -ERESTARTNOHAND:
case -ERESTARTSYS:
case -ERESTARTNOINTR:
regs->a0 = regs->orig_a0;
regs->epc -= 0x4;
break;All above are done in pt_regs and when returning to userspace, a7 will be recovered by restore_all in entry.S.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Tycho Andersen
Reviewed-byQuoted 36 lines · Guo Ren
Hi Tycho,
Quoted 11 lines · Tycho Andersen
Quoted 6 lines · On Mon, May 25, 2020 at 02:18:26PM +0000, [email protected] wrote:
From: Guo Ren <[email protected]>
Obviously, there is no need to recover a0-a7 in reject path.
Previous modification is from commit
af33d243by Tycho, to fixup seccomp reject syscall code path.Doesn't this suffer from the same problem, though? a7 is clobbered, so the
-ERESTARTSYSbehavior won't work?Look, the patch only affects the path of
ret_from_syscall_rejected, and there are two possible paths:
1.ret_from_syscall_rejected->handle_syscall_trace_exit->ret_from_exception
2.ret_from_syscall_rejected->ret_from_exceptionAll the above skip the
check_syscall_nrand ignore the current a7, in the C function they use thept_regsin the stack to get proper reg's value.For the
-ERESTARTSYS, we only process it in:ret_from_exception->resume_userspace->work_notifysig->do_notify_resume:do_signal&handle_signal:switch (regs->a0) { case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: regs->a0 = regs->orig_a0; regs->epc -= 0x4; break;
Quoted 2 lines
All above are done in
pt_regsand when returning to userspace, a7 will be recovered byrestore_allinentry.S.
Yes, thanks for that explanation.