sparc64: Split syscall_trace() into two functions.

Christoph Hellwig noticed that having both entry and exit
logic in one function no longer makes sense, and having
seperate ones simplifies things a lot.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h
index fc294a292899ee383906e5040e2509907776527e..2255244442f828d1b99cfd29be019edd996e992d 100644 (file)
--- a/arch/sparc64/kernel/entry.h
+++ b/arch/sparc64/kernel/entry.h
@@ -22,7 +22,8 @@ extern void do_notify_resume(struct pt_regs *regs,
                             unsigned long orig_i0,
                             unsigned long thread_info_flags);
 
-extern asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p);
+extern asmlinkage int syscall_trace_enter(struct pt_regs *regs);
+extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
 
 extern void bad_trap_tl1(struct pt_regs *regs, long lvl);
 

diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index bd578cc4856d6de60ed4e3ba54cec2874b32480c..db2ddf2e829e3e7ff08cea86ca6b586627698dd5 100644 (file)
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -1050,31 +1050,17 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        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;
 
        /* do the secure computing check first */
        secure_computing(regs->u_regs[UREG_G1]);
 
-       if (unlikely(current->audit_context) && syscall_exit_p) {
-               unsigned long tstate = regs->tstate;
-               int result = AUDITSC_SUCCESS;
-
-               if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
-                       result = AUDITSC_FAILURE;
-
-               audit_syscall_exit(result, regs->u_regs[UREG_I0]);
-       }
-
-       if (test_thread_flag(TIF_SYSCALL_TRACE)) {
-               if (syscall_exit_p)
-                       tracehook_report_syscall_exit(regs, 0);
-               else
-                       ret = tracehook_report_syscall_entry(regs);
-       }
+       if (test_thread_flag(TIF_SYSCALL_TRACE))
+               ret = tracehook_report_syscall_entry(regs);
 
-       if (unlikely(current->audit_context) && !syscall_exit_p && !ret)
+       if (unlikely(current->audit_context) && !ret)
                audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
                                     AUDIT_ARCH_SPARC :
                                     AUDIT_ARCH_SPARC64),
@@ -1086,3 +1072,19 @@ asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)
 
        return ret;
 }
+
+asmlinkage void syscall_trace_leave(struct pt_regs *regs)
+{
+       if (unlikely(current->audit_context)) {
+               unsigned long tstate = regs->tstate;
+               int result = AUDITSC_SUCCESS;
+
+               if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
+                       result = AUDITSC_FAILURE;
+
+               audit_syscall_exit(result, regs->u_regs[UREG_I0]);
+       }
+
+       if (test_thread_flag(TIF_SYSCALL_TRACE))
+               tracehook_report_syscall_exit(regs, 0);
+}

diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 0804f71df6cb8422fd09fda447be1a397fbd3c03..d44b2eeb25d56fdf0e362445331971013c970456 100644 (file)
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -68,7 +68,6 @@ extern void *__memscan_zero(void *, size_t);
 extern void *__memscan_generic(void *, int, size_t);
 extern int __memcmp(const void *, const void *, __kernel_size_t);
 extern __kernel_size_t strlen(const char *);
-extern void syscall_trace(struct pt_regs *, int);
 extern void sys_sigsuspend(void);
 extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
 extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);

diff --git a/arch/sparc64/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S
index a2f24270ed8af9f95b95ee0f685419b621244fa2..7a6786a71363c71f64e6686b31adb50f0faa1175 100644 (file)
--- a/arch/sparc64/kernel/syscalls.S
+++ b/arch/sparc64/kernel/syscalls.S
@@ -65,9 +65,8 @@ sys32_rt_sigreturn:
        andcc   %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
        be,pt   %icc, rtrap
         nop
-       add     %sp, PTREGS_OFF, %o0
-       call    syscall_trace
-        mov    1, %o1
+       call    syscall_trace_leave
+        add    %sp, PTREGS_OFF, %o0
        ba,pt   %xcc, rtrap
         nop
 
@@ -159,9 +158,8 @@ linux_sparc_ni_syscall:
         or     %l7, %lo(sys_ni_syscall), %l7
 
 linux_syscall_trace32:
-       add     %sp, PTREGS_OFF, %o0
-       call    syscall_trace
-        clr    %o1
+       call    syscall_trace_enter
+        add    %sp, PTREGS_OFF, %o0
        brnz,pn %o0, 3f
         mov    -ENOSYS, %o0
        srl     %i0, 0, %o0
@@ -172,9 +170,8 @@ linux_syscall_trace32:
         srl    %i3, 0, %o3
 
 linux_syscall_trace:
-       add     %sp, PTREGS_OFF, %o0
-       call    syscall_trace
-        clr    %o1
+       call    syscall_trace_enter
+        add    %sp, PTREGS_OFF, %o0
        brnz,pn %o0, 3f
         mov    -ENOSYS, %o0
        mov     %i0, %o0
@@ -275,9 +272,8 @@ ret_sys_call:
        b,pt    %xcc, rtrap
         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 linux_syscall_trace2:
-       add     %sp, PTREGS_OFF, %o0
-       call    syscall_trace
-        mov    1, %o1
+       call    syscall_trace_leave
+        add    %sp, PTREGS_OFF, %o0
        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
        ba,pt   %xcc, rtrap
         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]