2013-06-14 02:20:03

by zhangwei(Jovi)

Subject: [PATCH] tracing/kprobes: remove unnecessary checking of, trace_probe_is_enabled

Since tp->flags assignment was moved into function enable_trace_probe,
so there have no need to use trace_probe_is_enabled to check flags
in same function.

Remove the unnecessary checking.

Signed-off-by: zhangwei(Jovi) <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Srikar Dronamraju <[email protected]>
---
kernel/trace/trace_kprobe.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 9f46e98..f237417 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -240,8 +240,7 @@ enable_trace_probe(struct trace_probe *tp, struct ftrace_event_file *file)
} else
tp->flags |= TP_FLAG_PROFILE;

- if (trace_probe_is_enabled(tp) && trace_probe_is_registered(tp) &&
- !trace_probe_has_gone(tp)) {
+ if (trace_probe_is_registered(tp) && !trace_probe_has_gone(tp)) {
if (trace_probe_is_return(tp))
ret = enable_kretprobe(&tp->rp);
else
--
1.7.9.7

2013-06-14 03:03:00

by 平松雅巳 / HIRAMATU，MASAMI

Subject: Re: [PATCH] tracing/kprobes: remove unnecessary checking of, trace_probe_is_enabled

(2013/06/14 11:10), zhangwei(Jovi) wrote:
> Since tp->flags assignment was moved into function enable_trace_probe,
> so there have no need to use trace_probe_is_enabled to check flags
> in same function.

Indeed :)

>
> Remove the unnecessary checking.


Acked-by: Masami Hiramatsu <[email protected]>

>
> Signed-off-by: zhangwei(Jovi) <[email protected]>
> Cc: Masami Hiramatsu <[email protected]>
> Cc: Frederic Weisbecker <[email protected]>
> Cc: Oleg Nesterov <[email protected]>
> Cc: Srikar Dronamraju <[email protected]>
> ---
> kernel/trace/trace_kprobe.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 9f46e98..f237417 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -240,8 +240,7 @@ enable_trace_probe(struct trace_probe *tp, struct ftrace_event_file *file)
> } else
> tp->flags |= TP_FLAG_PROFILE;
>
> - if (trace_probe_is_enabled(tp) && trace_probe_is_registered(tp) &&
> - !trace_probe_has_gone(tp)) {
> + if (trace_probe_is_registered(tp) && !trace_probe_has_gone(tp)) {
> if (trace_probe_is_return(tp))
> ret = enable_kretprobe(&tp->rp);
> else
>


--
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: [email protected]

2013-06-17 16:53:26

by Steven Rostedt

Subject: Re: [PATCH] tracing/kprobes: remove unnecessary checking of, trace_probe_is_enabled

On Fri, 2013-06-14 at 12:02 +0900, Masami Hiramatsu wrote:
> (2013/06/14 11:10), zhangwei(Jovi) wrote:
> > Since tp->flags assignment was moved into function enable_trace_probe,
> > so there have no need to use trace_probe_is_enabled to check flags
> > in same function.
>
> Indeed :)
>
> >
> > Remove the unnecessary checking.
>
>
> Acked-by: Masami Hiramatsu <[email protected]>
>

Thanks, I added this to my 3.11 queue.

-- Steve