[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090827175000.GA6032@nowhere>
Date: Thu, 27 Aug 2009 19:50:02 +0200
From: Frederic Weisbecker <fweisbec@...il.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: LKML <linux-kernel@...r.kernel.org>,
Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>,
Jason Baron <jbaron@...hat.com>,
Lai Jiangshan <laijs@...fujitsu.com>,
Steven Rostedt <rostedt@...dmis.org>,
Peter Zijlstra <peterz@...radead.org>,
Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>,
Jiaying Zhang <jiayingz@...gle.com>,
Martin Bligh <mbligh@...gle.com>,
Li Zefan <lizf@...fujitsu.com>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Paul Mundt <lethal@...ux-sh.org>
Subject: Re: [PATCH 1/7] tracing: Add syscall tracepoints - s390 arch update
Oh, I forgot to put the
Acked-by: Heiko Carstens <heiko.carstens@...ibm.com> on this one.
Sorry...
On Thu, Aug 27, 2009 at 07:43:29PM +0200, Frederic Weisbecker wrote:
> From: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
>
> This patch includes s390 arch updates to synchronize with latest
> core changes in the syscalls tracing area.
>
> - tracing: Map syscall name to number (syscall_name_to_nr())
> - tracing: Call arch_init_ftrace_syscalls at boot
> - tracing: add support tracepoint ids (set_syscall_{enter,exit}_id())
>
> Signed-off-by: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
> Cc: Jason Baron <jbaron@...hat.com>
> Cc: Frederic Weisbecker <fweisbec@...il.com>
> Cc: Ingo Molnar <mingo@...e.hu>
> Cc: Lai Jiangshan <laijs@...fujitsu.com>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
> Cc: Jiaying Zhang <jiayingz@...gle.com>
> Cc: Martin Bligh <mbligh@...gle.com>
> Cc: Li Zefan <lizf@...fujitsu.com>
> Cc: Martin Schwidefsky <schwidefsky@...ibm.com>
> Cc: Paul Mundt <lethal@...ux-sh.org>
> LKML-Reference: <20090825123111.GD4639@...us.boeblingen.de.ibm.com>
> Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
> ---
> arch/s390/kernel/ftrace.c | 36 +++++++++++++++++++++++++++---------
> 1 files changed, 27 insertions(+), 9 deletions(-)
>
> diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
> index 3e298e6..57bdcb1 100644
> --- a/arch/s390/kernel/ftrace.c
> +++ b/arch/s390/kernel/ftrace.c
> @@ -220,6 +220,29 @@ struct syscall_metadata *syscall_nr_to_meta(int nr)
> return syscalls_metadata[nr];
> }
>
> +int syscall_name_to_nr(char *name)
> +{
> + int i;
> +
> + if (!syscalls_metadata)
> + return -1;
> + for (i = 0; i < NR_syscalls; i++)
> + if (syscalls_metadata[i])
> + if (!strcmp(syscalls_metadata[i]->name, name))
> + return i;
> + return -1;
> +}
> +
> +void set_syscall_enter_id(int num, int id)
> +{
> + syscalls_metadata[num]->enter_id = id;
> +}
> +
> +void set_syscall_exit_id(int num, int id)
> +{
> + syscalls_metadata[num]->exit_id = id;
> +}
> +
> static struct syscall_metadata *find_syscall_meta(unsigned long syscall)
> {
> struct syscall_metadata *start;
> @@ -237,24 +260,19 @@ static struct syscall_metadata *find_syscall_meta(unsigned long syscall)
> return NULL;
> }
>
> -void arch_init_ftrace_syscalls(void)
> +static int __init arch_init_ftrace_syscalls(void)
> {
> struct syscall_metadata *meta;
> int i;
> - static atomic_t refs;
> -
> - if (atomic_inc_return(&refs) != 1)
> - goto out;
> syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) * NR_syscalls,
> GFP_KERNEL);
> if (!syscalls_metadata)
> - goto out;
> + return -ENOMEM;
> for (i = 0; i < NR_syscalls; i++) {
> meta = find_syscall_meta((unsigned long)sys_call_table[i]);
> syscalls_metadata[i] = meta;
> }
> - return;
> -out:
> - atomic_dec(&refs);
> + return 0;
> }
> +arch_initcall(arch_init_ftrace_syscalls);
> #endif
> --
> 1.6.2.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists