Re: [GIT PULL v2] tracing/kprobes: v1 + two fixes

Frederic Weisbecker
2009-08-27T15:40:18Z

On Thu, Aug 27, 2009 at 05:24:38PM +0200, Ingo Molnar wrote:
>
> * Frederic Weisbecker <fweisbec@gmail.com> wrote:
>
> > Ingo,
> >
> > This v2 can be either pulled after tracing/kprobes (the v1) or can
> > be pulled alone, it is based on the previous one and addresses
> > reviews from Li Zefan.
> >
> > Thanks,
> > Frederic.
> >
> > The following changes since commit 24851d2447830e6cba4c4b641cb73e713f312373:
> > Frederic Weisbecker (1):
> > tracing/kprobes: Dump the culprit kprobe in case of kprobe recursion
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
> > tracing/kprobes-2
> >
> > Frederic Weisbecker (2):
> > tracing: Restore the const qualifier for field names and types definition
> > tracing: Remove unneeded pointer casts
> >
> > include/linux/ftrace_event.h | 6 +++---
> > kernel/trace/trace_events.c | 4 ++--
> > kernel/trace/trace_syscalls.c | 8 ++++----
> > 3 files changed, 9 insertions(+), 9 deletions(-)
>
> I've pulled it into a staging branch (not yet in tip:master either
> and not yet on the road to upstream either), thanks guys!
>
> I have done some brief testing. One hickup is this build failure on
> x86, caused by the kprobes instruction decoder self-test:
>
> CHK include/linux/compile.h
> TEST posttest
> Error: 41001024: a1 08 30 c9 41 mov
> 0x41c93008,%eax
> Error: objdump says 5 bytes, but insn_get_length() says 9 (attr:40000)

I can't help for this one :)

> another one is this build warning:
>
> In file included from include/trace/events/napi.h:5,
> from net/core/net-traces.c:28:
> include/linux/tracepoint.h:285:1: warning: "TRACE_EVENT_FN" redefined
> In file included from include/trace/define_trace.h:61,
> from include/trace/events/skb.h:40,
> from net/core/net-traces.c:27:
> include/trace/ftrace.h:50:1: warning: this is the location of the previous definition
>
> config attached.

Oh, that looks like the site that includes two trace events headers.
I wonder if it also happens in -tip master without kprobes.

I'll check that, thanks.