sparc: Use tracehook routines in syscall_trace().
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
768225868c
commit
1c133b4b3d
|
@ -1196,8 +1196,9 @@ sys_rt_sigreturn:
|
||||||
be 1f
|
be 1f
|
||||||
nop
|
nop
|
||||||
|
|
||||||
|
add %sp, STACKFRAME_SZ, %o0
|
||||||
call syscall_trace
|
call syscall_trace
|
||||||
nop
|
mov 1, %o1
|
||||||
|
|
||||||
1:
|
1:
|
||||||
/* We are returning to a signal handler. */
|
/* We are returning to a signal handler. */
|
||||||
|
@ -1287,8 +1288,12 @@ linux_fast_syscall:
|
||||||
mov %i3, %o3
|
mov %i3, %o3
|
||||||
|
|
||||||
linux_syscall_trace:
|
linux_syscall_trace:
|
||||||
|
add %sp, STACKFRAME_SZ, %o0
|
||||||
call syscall_trace
|
call syscall_trace
|
||||||
nop
|
mov 0, %o1
|
||||||
|
cmp %o0, 0
|
||||||
|
bne 3f
|
||||||
|
mov -ENOSYS, %o0
|
||||||
mov %i0, %o0
|
mov %i0, %o0
|
||||||
mov %i1, %o1
|
mov %i1, %o1
|
||||||
mov %i2, %o2
|
mov %i2, %o2
|
||||||
|
@ -1337,6 +1342,7 @@ syscall_is_too_hard:
|
||||||
call %l7
|
call %l7
|
||||||
mov %i5, %o5
|
mov %i5, %o5
|
||||||
|
|
||||||
|
3:
|
||||||
st %o0, [%sp + STACKFRAME_SZ + PT_I0]
|
st %o0, [%sp + STACKFRAME_SZ + PT_I0]
|
||||||
|
|
||||||
ret_sys_call:
|
ret_sys_call:
|
||||||
|
@ -1374,6 +1380,8 @@ ret_sys_call:
|
||||||
st %l2, [%sp + STACKFRAME_SZ + PT_NPC]
|
st %l2, [%sp + STACKFRAME_SZ + PT_NPC]
|
||||||
|
|
||||||
linux_syscall_trace2:
|
linux_syscall_trace2:
|
||||||
|
add %sp, STACKFRAME_SZ, %o0
|
||||||
|
mov 1, %o1
|
||||||
call syscall_trace
|
call syscall_trace
|
||||||
add %l1, 0x4, %l2 /* npc = npc+4 */
|
add %l1, 0x4, %l2 /* npc = npc+4 */
|
||||||
st %l1, [%sp + STACKFRAME_SZ + PT_PC]
|
st %l1, [%sp + STACKFRAME_SZ + PT_PC]
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <linux/signal.h>
|
#include <linux/signal.h>
|
||||||
#include <linux/regset.h>
|
#include <linux/regset.h>
|
||||||
#include <linux/elf.h>
|
#include <linux/elf.h>
|
||||||
|
#include <linux/tracehook.h>
|
||||||
|
|
||||||
#include <asm/pgtable.h>
|
#include <asm/pgtable.h>
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
|
@ -450,21 +451,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
asmlinkage void syscall_trace(void)
|
asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p)
|
||||||
{
|
{
|
||||||
if (!test_thread_flag(TIF_SYSCALL_TRACE))
|
int ret = 0;
|
||||||
return;
|
|
||||||
if (!(current->ptrace & PT_PTRACED))
|
if (test_thread_flag(TIF_SYSCALL_TRACE)) {
|
||||||
return;
|
if (syscall_exit_p)
|
||||||
ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
|
tracehook_report_syscall_exit(regs, 0);
|
||||||
? 0x80 : 0));
|
else
|
||||||
/*
|
ret = tracehook_report_syscall_entry(regs);
|
||||||
* this isn't the same as continuing with a signal, but it will do
|
|
||||||
* for normal use. strace only continues with a signal if the
|
|
||||||
* stopping signal is not SIGTRAP. -brl
|
|
||||||
*/
|
|
||||||
if (current->exit_code) {
|
|
||||||
send_sig (current->exit_code, current, 1);
|
|
||||||
current->exit_code = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue