From patchwork Wed Jun 23 10:03:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Munsie X-Patchwork-Id: 56647 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 11A12B790D for ; Wed, 23 Jun 2010 20:08:41 +1000 (EST) Received: by ozlabs.org (Postfix) id 337EEB70B4; Wed, 23 Jun 2010 20:04:29 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp08.au.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 23BD6B76C5 for ; Wed, 23 Jun 2010 20:04:29 +1000 (EST) Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5NA4RxA001364 for ; Wed, 23 Jun 2010 20:04:27 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5NA4Ruq1835070 for ; Wed, 23 Jun 2010 20:04:27 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5NA4PDS017537 for ; Wed, 23 Jun 2010 20:04:27 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5NA4Ojv017525; Wed, 23 Jun 2010 20:04:24 +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 599387375E; Wed, 23 Jun 2010 20:04:24 +1000 (EST) From: "Ian Munsie" To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH 21/40] trace syscalls, PPC: Add ftrace compat syscall support for PPC64 Date: Wed, 23 Jun 2010 20:03:02 +1000 Message-Id: <1277287401-28571-22-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: FUJITA Tomonori , Frederic Weisbecker , Jason Baron , "H. Peter Anvin" , Steven Rostedt , Ingo Molnar , Paul Mackerras , Ian Munsie , Russell King , Andrew Morton , Christoph Hellwig , Anton Blanchard 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: Ian Munsie This patch adds the necessary infrastructure to trace 32bit compat syscalls on PowerPC64. Signed-off-by: Ian Munsie --- arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/unistd.h | 4 ++++ arch/powerpc/kernel/ftrace.c | 7 +++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0d5c28d..a724c93 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -142,6 +142,7 @@ config PPC select HAVE_PERF_EVENTS select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_SYSCALL_TRACEPOINTS + select HAVE_COMPAT_FTRACE_SYSCALLS if PPC64 config EARLY_PRINTK bool diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index f0a1026..f584b71 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h @@ -353,6 +353,10 @@ #define __NR__exit __NR_exit #define NR_syscalls __NR_syscalls +#ifdef CONFIG_PPC64 +#define NR_syscalls_compat NR_syscalls +#endif + #ifndef __ASSEMBLY__ #include diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index f5fadbb..dddbc33 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c @@ -619,3 +619,10 @@ inline bool arch_syscall_match_sym_name(const char *sym, const char *name) return (!strcmp(sym + 4, name + 3)); } #endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */ + +#ifdef CONFIG_COMPAT_FTRACE_SYSCALLS +unsigned long __init arch_compat_syscall_addr(int nr) +{ + return sys_call_table[nr*2+1]; +} +#endif