From patchwork Wed Jun 23 10:02:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Munsie X-Patchwork-Id: 56645 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 33DF7B82F4 for ; Wed, 23 Jun 2010 20:08:19 +1000 (EST) Received: by ozlabs.org (Postfix) id 8B460B70B1; Wed, 23 Jun 2010 20:04:26 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp07.au.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 60709B724B for ; Wed, 23 Jun 2010 20:04:26 +1000 (EST) Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5NA4Uvd006487 for ; Wed, 23 Jun 2010 20:04:30 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5NA4PrH1245320 for ; Wed, 23 Jun 2010 20:04:25 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5NA4Mhf027876 for ; Wed, 23 Jun 2010 20:04:25 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5NA4Mad027873; Wed, 23 Jun 2010 20:04:22 +1000 Received: from delenn.ozlabs.ibm.com (haven.au.ibm.com [9.190.164.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.au.ibm.com (Postfix) with ESMTP id 12C2F73962; Wed, 23 Jun 2010 20:04:22 +1000 (EST) From: "Ian Munsie" To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH 18/40] compat_syscalls: introduce CONFIG_COMPAT_FTRACE_SYSCALLS Date: Wed, 23 Jun 2010 20:02:59 +1000 Message-Id: <1277287401-28571-19-git-send-email-imunsie@au1.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> References: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> Cc: x86@kernel.org, Andrew Morton , Robert Richter , Frederic Weisbecker , Jason Baron , "H. Peter Anvin" , Heiko Carstens , Steven Rostedt , "David S. Miller" , Ingo Molnar , Paul Mackerras , Ian Munsie , Ingo Molnar , Thomas Gleixner , Roland McGrath , Masami Hiramatsu X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Jason Baron 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 Signed-off-by: Ian Munsie --- 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 #include -#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;