tracing: Unify arch_syscall_addr() implementations
Most implementations of arch_syscall_addr() are the same, so create a default version in common code and move the one piece that differs (the syscall table) to asm/syscall.h. New arch ports don't have to waste time copying & pasting this simple function. The s390/sparc versions need to be different, so document why. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <1264498803-17278-1-git-send-email-vapier@gentoo.org> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
parent
ea2c68a08f
commit
e7b8e675d9
@ -218,11 +218,10 @@ HAVE_SYSCALL_TRACEPOINTS
|
|||||||
|
|
||||||
You need very few things to get the syscalls tracing in an arch.
|
You need very few things to get the syscalls tracing in an arch.
|
||||||
|
|
||||||
|
- Support HAVE_ARCH_TRACEHOOK (see arch/Kconfig).
|
||||||
- Have a NR_syscalls variable in <asm/unistd.h> that provides the number
|
- Have a NR_syscalls variable in <asm/unistd.h> that provides the number
|
||||||
of syscalls supported by the arch.
|
of syscalls supported by the arch.
|
||||||
- Implement arch_syscall_addr() that resolves a syscall address from a
|
- Support the TIF_SYSCALL_TRACEPOINT thread flags.
|
||||||
syscall number.
|
|
||||||
- Support the TIF_SYSCALL_TRACEPOINT thread flags
|
|
||||||
- Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace
|
- Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace
|
||||||
in the ptrace syscalls tracing path.
|
in the ptrace syscalls tracing path.
|
||||||
- Tag this arch as HAVE_SYSCALL_TRACEPOINTS.
|
- Tag this arch as HAVE_SYSCALL_TRACEPOINTS.
|
||||||
|
@ -15,6 +15,13 @@
|
|||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The syscall table always contains 32 bit pointers since we know that the
|
||||||
|
* address of the function to be called is (way) below 4GB. So the "int"
|
||||||
|
* type here is what we want [need] for both 32 bit and 64 bit systems.
|
||||||
|
*/
|
||||||
|
extern const unsigned int sys_call_table[];
|
||||||
|
|
||||||
static inline long syscall_get_nr(struct task_struct *task,
|
static inline long syscall_get_nr(struct task_struct *task,
|
||||||
struct pt_regs *regs)
|
struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
|
@ -200,13 +200,3 @@ out:
|
|||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
||||||
|
|
||||||
#ifdef CONFIG_FTRACE_SYSCALLS
|
|
||||||
|
|
||||||
extern unsigned int sys_call_table[];
|
|
||||||
|
|
||||||
unsigned long __init arch_syscall_addr(int nr)
|
|
||||||
{
|
|
||||||
return (unsigned long)sys_call_table[nr];
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef __ASM_SH_SYSCALL_H
|
#ifndef __ASM_SH_SYSCALL_H
|
||||||
#define __ASM_SH_SYSCALL_H
|
#define __ASM_SH_SYSCALL_H
|
||||||
|
|
||||||
|
extern const unsigned long sys_call_table[];
|
||||||
|
|
||||||
#ifdef CONFIG_SUPERH32
|
#ifdef CONFIG_SUPERH32
|
||||||
# include "syscall_32.h"
|
# include "syscall_32.h"
|
||||||
#else
|
#else
|
||||||
|
@ -399,12 +399,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
||||||
|
|
||||||
#ifdef CONFIG_FTRACE_SYSCALLS
|
|
||||||
extern unsigned long *sys_call_table;
|
|
||||||
|
|
||||||
unsigned long __init arch_syscall_addr(int nr)
|
|
||||||
{
|
|
||||||
return (unsigned long)sys_call_table[nr];
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_FTRACE_SYSCALLS */
|
|
||||||
|
@ -5,6 +5,13 @@
|
|||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The syscall table always contains 32 bit pointers since we know that the
|
||||||
|
* address of the function to be called is (way) below 4GB. So the "int"
|
||||||
|
* type here is what we want [need] for both 32 bit and 64 bit systems.
|
||||||
|
*/
|
||||||
|
extern const unsigned int sys_call_table[];
|
||||||
|
|
||||||
/* The system call number is given by the user in %g1 */
|
/* The system call number is given by the user in %g1 */
|
||||||
static inline long syscall_get_nr(struct task_struct *task,
|
static inline long syscall_get_nr(struct task_struct *task,
|
||||||
struct pt_regs *regs)
|
struct pt_regs *regs)
|
||||||
|
@ -91,14 +91,3 @@ int __init ftrace_dyn_arch_init(void *data)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_FTRACE_SYSCALLS
|
|
||||||
|
|
||||||
extern unsigned int sys_call_table[];
|
|
||||||
|
|
||||||
unsigned long __init arch_syscall_addr(int nr)
|
|
||||||
{
|
|
||||||
return (unsigned long)sys_call_table[nr];
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -16,6 +16,8 @@
|
|||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
|
||||||
|
extern const unsigned long sys_call_table[];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Only the low 32 bits of orig_ax are meaningful, so we return int.
|
* Only the low 32 bits of orig_ax are meaningful, so we return int.
|
||||||
* This importantly ignores the high bits on 64-bit, so comparisons
|
* This importantly ignores the high bits on 64-bit, so comparisons
|
||||||
|
@ -484,13 +484,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|
||||||
|
|
||||||
#ifdef CONFIG_FTRACE_SYSCALLS
|
|
||||||
|
|
||||||
extern unsigned long *sys_call_table;
|
|
||||||
|
|
||||||
unsigned long __init arch_syscall_addr(int nr)
|
|
||||||
{
|
|
||||||
return (unsigned long)(&sys_call_table)[nr];
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
@ -511,4 +511,10 @@ static inline void trace_hw_branch_oops(void) {}
|
|||||||
|
|
||||||
#endif /* CONFIG_HW_BRANCH_TRACER */
|
#endif /* CONFIG_HW_BRANCH_TRACER */
|
||||||
|
|
||||||
|
#ifdef CONFIG_FTRACE_SYSCALLS
|
||||||
|
|
||||||
|
unsigned long arch_syscall_addr(int nr);
|
||||||
|
|
||||||
|
#endif /* CONFIG_FTRACE_SYSCALLS */
|
||||||
|
|
||||||
#endif /* _LINUX_FTRACE_H */
|
#endif /* _LINUX_FTRACE_H */
|
||||||
|
@ -394,6 +394,11 @@ int init_syscall_trace(struct ftrace_event_call *call)
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned long __init arch_syscall_addr(int nr)
|
||||||
|
{
|
||||||
|
return (unsigned long)sys_call_table[nr];
|
||||||
|
}
|
||||||
|
|
||||||
int __init init_ftrace_syscalls(void)
|
int __init init_ftrace_syscalls(void)
|
||||||
{
|
{
|
||||||
struct syscall_metadata *meta;
|
struct syscall_metadata *meta;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user