[PATCH 18/40] compat_syscalls: introduce CONFIG_COMPAT_FTRACE_SYSCALLS
From: Ian Munsie <hidden>
Date: 2010-06-23 10:09:19
Also in:
lkml
Subsystem:
abi/api, function hooks (ftrace), the rest, tracing, x86 architecture (32-bit and 64-bit) · Maintainers:
Steven Rostedt, Masami Hiramatsu, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
From: Jason Baron <redacted> move the logic for enabling compat syscalls to common arch/Kconfig, where config_compat_ftrace_syscalls depends on CONFIG_COMPAT, CONFIG_FTRACE_SYSCALLS, and a per-arch CONFIG_HAVE_COMPAT_FTRACE_SYSCALLS. In this way arches that want to add support for compat syscalls, can request it via selecting HAVE_COMPAT_FTRACE_SYSCALLS in their respective arch Kconfig files. Signed-off-by: Jason Baron <redacted> Signed-off-by: Ian Munsie <redacted> --- arch/Kconfig | 7 +++++++ arch/x86/Kconfig | 1 + arch/x86/include/asm/syscall.h | 4 ---- arch/x86/kernel/ftrace.c | 2 +- include/linux/syscalls.h | 2 +- kernel/trace/trace_syscalls.c | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 4877a8c..056f81f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig@@ -158,4 +158,11 @@ config HAVE_PERF_EVENTS_NMI subsystem. Also has support for calculating CPU cycle events to determine how many clock cycles in a given period. +config HAVE_COMPAT_FTRACE_SYSCALLS + bool + +config COMPAT_FTRACE_SYSCALLS + def_bool y + depends on COMPAT && FTRACE_SYSCALLS && HAVE_COMPAT_FTRACE_SYSCALLS + source "kernel/gcov/Kconfig"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3069a6d..2a2d65c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig@@ -40,6 +40,7 @@ config X86 select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE select HAVE_SYSCALL_TRACEPOINTS + select HAVE_COMPAT_FTRACE_SYSCALLS select HAVE_KVM select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 4e462cc..f734812 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h@@ -16,10 +16,6 @@ #include <linux/sched.h> #include <linux/err.h> -#if defined(CONFIG_COMPAT) && defined(CONFIG_FTRACE_SYSCALLS) - #define __HAVE_ARCH_FTRACE_COMPAT_SYSCALLS -#endif - extern const unsigned long sys_call_table[]; extern const unsigned long *ia32_sys_call_table;
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 4b36a0b..662343b 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c@@ -512,7 +512,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ -#ifdef __HAVE_ARCH_FTRACE_COMPAT_SYSCALLS +#ifdef CONFIG_COMPAT_FTRACE_SYSCALLS unsigned long __init arch_compat_syscall_addr(int nr) { return (unsigned long)(&ia32_sys_call_table)[nr];
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index e115569..55a9f2b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h@@ -222,7 +222,7 @@ extern struct trace_event_functions exit_syscall_print_funcs; #define COMPAT_SYSCALL_DEFINE5(name, ...) COMPAT_SYSCALL_DEFINEx(5, compat_sys_##name, name, __VA_ARGS__) #define COMPAT_SYSCALL_DEFINE6(name, ...) COMPAT_SYSCALL_DEFINEx(6, compat_sys_##name, name, __VA_ARGS__) -#ifdef CONFIG_FTRACE_SYSCALLS +#ifdef CONFIG_COMPAT_FTRACE_SYSCALLS #define COMPAT_SYSCALL_DEFINEx(x, syscall, sname, ...) \ static const char *types_compat_sys_##sname[] = { \ __SC_STR_TDECL##x(__VA_ARGS__) \
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index ff6cd7a..6acba20 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c@@ -519,7 +519,7 @@ int __init init_ftrace_syscalls(void) meta->syscall_nr = i; syscalls_metadata[i] = meta; } -#ifdef __HAVE_ARCH_FTRACE_COMPAT_SYSCALLS +#ifdef CONFIG_COMPAT_FTRACE_SYSCALLS if (NR_syscalls_compat) { int match; struct ftrace_event_call *ftrace_event;
--
1.7.1