* Ingo Molnar <mingo@xxxxxxx> wrote:
> * Paul Mundt <lethal@xxxxxxxxxxxx> wrote:
>
> > [ Adding to Cc everyone that now has a broken tree thanks to this .. ]
> >
> > On Wed, Aug 12, 2009 at 11:11:33AM +0200, Ingo Molnar wrote:
> > > * Frederic Weisbecker <fweisbec@xxxxxxxxx> wrote:
> > > > This pull request integrate one cleanup/fix for ftrace and an
> > > > update for syscall tracing: the migration from old-style tracer to
> > > > individual tracepoints/trace_events and the support for perf
> > > > counter.
> > > >
> > > > I've tested it with success either with ftrace (every syscall
> > > > tracepoints enabled at the same time without problems) and with
> > > > perfcounter.
> > > >
> > > > May be one drawback: it creates so much trace events that the
> > > > ftrace selftests can take some time :-)
> > >
> > > Pulled, thanks a lot!
> >
> > And this has now subsequently broken every single SH and S390
> > configuration, [...]
>
> I test SH cross-builds regularly. I just checked the SH defconfig
> and it builds just fine here:
>
> $ make -j32 CROSS_COMPILE=sh3-linux- ARCH=sh vmlinux
The s390 build indeed broke. (This got masked by the s390 toolchain
i'm using not having been able to build Linus's tree - i fixed
that.)
Could you try the fix below? It does the trick here.
Martin, Heiko - does the fix look good to you? regs->gprs[2] seems
to be the register used for both the syscall number (enter
callback) and for the return code (exit callback).
Regarding SH, the fixup should be similarly trivial. Since SH's
FTRACE_SYSCALLS code is not upstream yet it can (and should) be
carried in the tree that integrates the SH tree and the tracing
tree - linux-next in this case.
Thanks,
Ingo
------------------------------>
>From a9008fd42b1c3c89f684d90bdfb9c2d05c7af119 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@xxxxxxx>
Date: Tue, 18 Aug 2009 10:41:57 +0200
Subject: [PATCH] [S390] ftrace: update system call tracer support
Commit fb34a08c3 ("tracing: Add trace events for each syscall
entry/exit") changed the lowlevel API to ftrace syscall tracing
but did not update s390 which started making use of it recently.
This broke the s390 build, as reported by Paul Mundt.
Update the callbacks with the syscall number and the syscall
return code values. This allows per syscall tracepoints,
syscall argument enumeration /debug/tracing/events/syscalls/
and perfcounters support and integration on s390 too.
Reported-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <tip-fb34a08c3469b2be9eae626ccb96476b4687b810@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/s390/kernel/ptrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 43acd73..05f57cd 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -662,7 +662,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
}
if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
- ftrace_syscall_enter(regs);
+ trace_syscall_enter(regs, regs->gprs[2]);
if (unlikely(current->audit_context))
audit_syscall_entry(is_compat_task() ?
@@ -680,7 +680,7 @@ asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)
regs->gprs[2]);
if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
- ftrace_syscall_exit(regs);
+ trace_syscall_exit(regs, regs->gprs[2]);
if (test_thread_flag(TIF_SYSCALL_TRACE))
tracehook_report_syscall_exit(regs, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
