[GIT PULL] tracing/kprobes: Fix field creation's bad error handling

[GIT PULL] tracing/kprobes: Fix field creation's bad error handling

[Frederic Weisbecker]

Ingo,

Please pull the tracing/fixes branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
	tracing/fixes

Thanks,
	Frederic
---

Frederic Weisbecker (1):
      tracing/kprobes: Fix field creation's bad error handling


 kernel/trace/trace_kprobe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---
>From 12e22dfaaee46f70762beb1982a7b86a68317b11 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Tue, 8 Dec 2009 10:00:04 +0100
Subject: [PATCH] tracing/kprobes: Fix field creation's bad error handling
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@redhat.com>, Li Zefan <lizf@cn.fujitsu.com>

When we define the common event fields in kprobe, we invert the error
handling and return immediately in case of success. Then we omit
to define specific kprobes fields (ip and nargs), and specific
kretprobes fields (func, ret_ip, nargs). And we only define them
when we fail to create common fields.

The most visible consequence is that we can't create filter for
k(ret)probes specific fields.

This patch re-invert the success/error handling to fix it.

Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
---
 kernel/trace/trace_kprobe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index aff5f80..ca04523 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1114,7 +1114,7 @@ static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
 	struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
 	ret = trace_define_common_fields(event_call);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
@@ -1132,7 +1132,7 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
 	struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
 	ret = trace_define_common_fields(event_call);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
-- 
1.6.2.3

Re: [GIT PULL] tracing/kprobes: Fix field creation's bad error handling

[Masami Hiramatsu]

Frederic Weisbecker wrote:
> Ingo,
> 
> Please pull the tracing/fixes branch that can be found at:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> 	tracing/fixes
> 
> Thanks,
> 	Frederic
> ---
> 
> Frederic Weisbecker (1):
>       tracing/kprobes: Fix field creation's bad error handling
> 
> 
>  kernel/trace/trace_kprobe.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> ---
> From 12e22dfaaee46f70762beb1982a7b86a68317b11 Mon Sep 17 00:00:00 2001
> From: Frederic Weisbecker <fweisbec@gmail.com>
> Date: Tue, 8 Dec 2009 10:00:04 +0100
> Subject: [PATCH] tracing/kprobes: Fix field creation's bad error handling
> Cc: Lai Jiangshan <laijs@cn.fujitsu.com>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@redhat.com>, Li Zefan <lizf@cn.fujitsu.com>
> 
> When we define the common event fields in kprobe, we invert the error
> handling and return immediately in case of success. Then we omit
> to define specific kprobes fields (ip and nargs), and specific
> kretprobes fields (func, ret_ip, nargs). And we only define them
> when we fail to create common fields.
> 
> The most visible consequence is that we can't create filter for
> k(ret)probes specific fields.
> 
> This patch re-invert the success/error handling to fix it.
> 
> Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Masami Hiramatsu <mhiramat@redhat.com>
> Cc: Li Zefan <lizf@cn.fujitsu.com>

Thanks for fix that.

Acked-by: Masami Hiramatsu <mhiramat@redhat.com>


Ingo, I think this should go to tip:urgent.

Thank you,

> ---
>  kernel/trace/trace_kprobe.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index aff5f80..ca04523 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -1114,7 +1114,7 @@ static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
>  	struct trace_probe *tp = (struct trace_probe *)event_call->data;
>  
>  	ret = trace_define_common_fields(event_call);
> -	if (!ret)
> +	if (ret)
>  		return ret;
>  
>  	DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
> @@ -1132,7 +1132,7 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
>  	struct trace_probe *tp = (struct trace_probe *)event_call->data;
>  
>  	ret = trace_define_common_fields(event_call);
> -	if (!ret)
> +	if (ret)
>  		return ret;
>  
>  	DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);

-- 
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: mhiramat@redhat.com

Re: [GIT PULL] tracing/kprobes: Fix field creation's bad error handling

[Ingo Molnar]

* Masami Hiramatsu <mhiramat@redhat.com> wrote:

> Frederic Weisbecker wrote:
> > Ingo,
> > 
> > Please pull the tracing/fixes branch that can be found at:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> > 	tracing/fixes
> > 
> > Thanks,
> > 	Frederic
> > ---
> > 
> > Frederic Weisbecker (1):
> >       tracing/kprobes: Fix field creation's bad error handling
> > 
> > 
> >  kernel/trace/trace_kprobe.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > ---
> > From 12e22dfaaee46f70762beb1982a7b86a68317b11 Mon Sep 17 00:00:00 2001
> > From: Frederic Weisbecker <fweisbec@gmail.com>
> > Date: Tue, 8 Dec 2009 10:00:04 +0100
> > Subject: [PATCH] tracing/kprobes: Fix field creation's bad error handling
> > Cc: Lai Jiangshan <laijs@cn.fujitsu.com>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@redhat.com>, Li Zefan <lizf@cn.fujitsu.com>
> > 
> > When we define the common event fields in kprobe, we invert the error
> > handling and return immediately in case of success. Then we omit
> > to define specific kprobes fields (ip and nargs), and specific
> > kretprobes fields (func, ret_ip, nargs). And we only define them
> > when we fail to create common fields.
> > 
> > The most visible consequence is that we can't create filter for
> > k(ret)probes specific fields.
> > 
> > This patch re-invert the success/error handling to fix it.
> > 
> > Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> > Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Cc: Masami Hiramatsu <mhiramat@redhat.com>
> > Cc: Li Zefan <lizf@cn.fujitsu.com>
> 
> Thanks for fix that.
> 
> Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
> 
> 
> Ingo, I think this should go to tip:urgent.

Will apply, thanks guys!

	Ingo

[tip:perf/urgent] tracing/kprobes: Fix field creation's bad error handling

[tip-bot for Frederic Weisbecker]

Commit-ID:  822a6961112f0c9101d3359d8524604c3309ee6c
Gitweb:     http://git.kernel.org/tip/822a6961112f0c9101d3359d8524604c3309ee6c
Author:     Frederic Weisbecker <fweisbec@gmail.com>
AuthorDate: Tue, 8 Dec 2009 10:00:04 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 9 Dec 2009 10:32:21 +0100

tracing/kprobes: Fix field creation's bad error handling

When we define the common event fields in kprobe, we invert the error
handling and return immediately in case of success. Then we omit
to define specific kprobes fields (ip and nargs), and specific
kretprobes fields (func, ret_ip, nargs). And we only define them
when we fail to create common fields.

The most visible consequence is that we can't create filter for
k(ret)probes specific fields.

This patch re-invert the success/error handling to fix it.

Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <1260263815-5167-1-git-send-regression-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/trace/trace_kprobe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index bf05fb4..b52d397 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1133,7 +1133,7 @@ static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
 	struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
 	ret = trace_define_common_fields(event_call);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
@@ -1151,7 +1151,7 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
 	struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
 	ret = trace_define_common_fields(event_call);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);