Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753595Ab0AVNnS (ORCPT ); Fri, 22 Jan 2010 08:43:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752009Ab0AVNnR (ORCPT ); Fri, 22 Jan 2010 08:43:17 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:45363 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751822Ab0AVNnQ (ORCPT ); Fri, 22 Jan 2010 08:43:16 -0500 From: Mike Frysinger To: linux-kernel@vger.kernel.org, Steven Rostedt , Frederic Weisbecker , Ingo Molnar Cc: Hendrik Brueckner , "David S. Miller" Subject: [PATCH] ftrace: unify arch_syscall_addr() implementations Date: Fri, 22 Jan 2010 08:43:46 -0500 Message-Id: <1264167826-20913-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.6.6.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5111 Lines: 154 Every arch_syscall_addr() implementation thus far is the same, so unify them as a default weak in common code so more arches don't have to waste time copying & pasting this simple function. The Blackfin version is going to be exactly the same. Signed-off-by: Mike Frysinger --- note: only thing that needs double checking is s390 and sparc where they declared the sys_call_table as an array of ints. considering this table is supposed to be an array of function pointers, this seems like more of a typo to me ... also, does the arch_syscall_addr() even really need to be weak ? or can we assume that everyone is going to be sane and do it the same way ... Documentation/trace/ftrace-design.txt | 6 +++++- arch/s390/kernel/ftrace.c | 10 ---------- arch/sh/kernel/ftrace.c | 9 --------- arch/sparc/kernel/ftrace.c | 11 ----------- arch/x86/kernel/ftrace.c | 10 ---------- include/linux/ftrace.h | 6 ++++++ kernel/trace/trace_syscalls.c | 6 ++++++ 7 files changed, 17 insertions(+), 41 deletions(-) diff --git a/Documentation/trace/ftrace-design.txt b/Documentation/trace/ftrace-design.txt index 6a5a579..1a67b8c 100644 --- a/Documentation/trace/ftrace-design.txt +++ b/Documentation/trace/ftrace-design.txt @@ -240,8 +240,12 @@ You need very few things to get the syscalls tracing in an arch. - Have a NR_syscalls variable in that provides the number of syscalls supported by the arch. +- Implement . - Implement arch_syscall_addr() that resolves a syscall address from a - syscall number. + syscall number. For the simple arches where your syscall table is an + array of longs named "sys_call_table", there is a default implementation + in kernel/trace/trace_syscalls.c. If your arch needs something weird, + then you'll have to define the function yourself. - Support the TIF_SYSCALL_TRACEPOINT thread flags - Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace in the ptrace syscalls tracing path. diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index 5a82bc6..9e69449 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c @@ -200,13 +200,3 @@ out: return parent; } #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 diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index a48cded..30e1319 100644 --- a/arch/sh/kernel/ftrace.c +++ b/arch/sh/kernel/ftrace.c @@ -399,12 +399,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) } } #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 */ diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 29973da..9103a56 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -91,14 +91,3 @@ int __init ftrace_dyn_arch_init(void *data) return 0; } #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 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 3096892..0d93a94 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -484,13 +484,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, } } #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 diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 0b4f97d..1cbb36f 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -511,4 +511,10 @@ static inline void trace_hw_branch_oops(void) {} #endif /* CONFIG_HW_BRANCH_TRACER */ +#ifdef CONFIG_FTRACE_SYSCALLS + +unsigned long arch_syscall_addr(int nr); + +#endif /* CONFIG_FTRACE_SYSCALLS */ + #endif /* _LINUX_FTRACE_H */ diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 75289f3..671c670 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -394,6 +394,12 @@ int init_syscall_trace(struct ftrace_event_call *call) return 0; } +unsigned long __init __weak arch_syscall_addr(int nr) +{ + extern const unsigned long sys_call_table[]; + return sys_call_table[nr]; +} + int __init init_ftrace_syscalls(void) { struct syscall_metadata *meta; -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/