| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1310814671.27864.79.camel@gandalf.stny.rr.com>
Date: Sat, 16 Jul 2011 07:11:11 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Ingo Molnar <mingo@...e.hu>, yrl.pp-manager.tt@...achi.com,
linux-kernel@...r.kernel.org,
Frederic Weisbecker <fweisbec@...il.com>,
Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: Re: [PATCH -tip v2] [CLEANUP]tracing/kprobes: merge trace probe
enable/disable functions
On Sat, 2011-07-16 at 19:33 +0900, Masami Hiramatsu wrote:
> Merge redundant enable/disable functions into enable_trace_probe()
> and disable_trace_probe().
>
> Changes from v1:
> - replace probe_event_enable() with enable_trace_probe()
> in self-test code too.
Ah, I already fixed it and ran it through all my tests. I'll send it out
in a minute. I'll make sure I fixed it the same way first.
Thanks!
-- Steve
>
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: Frederic Weisbecker <fweisbec@...il.com>
> Cc: Ingo Molnar <mingo@...e.hu>
> Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
> ---
>
> kernel/trace/trace_kprobe.c | 92 +++++++++++++++++--------------------------
> 1 files changed, 36 insertions(+), 56 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 14b88ed..3be50c5 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -683,6 +683,34 @@ static struct trace_probe *find_trace_probe(const char *event,
> return NULL;
> }
>
> +/* Enable trace_probe - @flag must be TP_FLAG_TRACE or TP_FLAG_PROFILE */
> +static int enable_trace_probe(struct trace_probe *tp, int flag)
> +{
> + int ret = 0;
> +
> + tp->flags |= flag;
> + if (tp->flags & (TP_FLAG_TRACE | TP_FLAG_PROFILE)) {
> + if (trace_probe_is_return(tp))
> + ret = enable_kretprobe(&tp->rp);
> + else
> + ret = enable_kprobe(&tp->rp.kp);
> + }
> +
> + return ret;
> +}
> +
> +/* Disable trace_probe - @flag must be TP_FLAG_TRACE or TP_FLAG_PROFILE */
> +static void disable_trace_probe(struct trace_probe *tp, int flag)
> +{
> + tp->flags &= ~flag;
> + if (!(tp->flags & (TP_FLAG_TRACE | TP_FLAG_PROFILE))) {
> + if (trace_probe_is_return(tp))
> + disable_kretprobe(&tp->rp);
> + else
> + disable_kprobe(&tp->rp.kp);
> + }
> +}
> +
> /* Unregister a trace_probe and probe_event: call with locking probe_lock */
> static void unregister_trace_probe(struct trace_probe *tp)
> {
> @@ -1514,30 +1542,6 @@ partial:
> return TRACE_TYPE_PARTIAL_LINE;
> }
>
> -static int probe_event_enable(struct ftrace_event_call *call)
> -{
> - struct trace_probe *tp = (struct trace_probe *)call->data;
> -
> - tp->flags |= TP_FLAG_TRACE;
> - if (trace_probe_is_return(tp))
> - return enable_kretprobe(&tp->rp);
> - else
> - return enable_kprobe(&tp->rp.kp);
> -}
> -
> -static void probe_event_disable(struct ftrace_event_call *call)
> -{
> - struct trace_probe *tp = (struct trace_probe *)call->data;
> -
> - tp->flags &= ~TP_FLAG_TRACE;
> - if (!(tp->flags & (TP_FLAG_TRACE | TP_FLAG_PROFILE))) {
> - if (trace_probe_is_return(tp))
> - disable_kretprobe(&tp->rp);
> - else
> - disable_kprobe(&tp->rp.kp);
> - }
> -}
> -
> #undef DEFINE_FIELD
> #define DEFINE_FIELD(type, item, name, is_signed) \
> do { \
> @@ -1716,49 +1720,25 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
> head = this_cpu_ptr(call->perf_events);
> perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1, regs, head);
> }
> -
> -static int probe_perf_enable(struct ftrace_event_call *call)
> -{
> - struct trace_probe *tp = (struct trace_probe *)call->data;
> -
> - tp->flags |= TP_FLAG_PROFILE;
> -
> - if (trace_probe_is_return(tp))
> - return enable_kretprobe(&tp->rp);
> - else
> - return enable_kprobe(&tp->rp.kp);
> -}
> -
> -static void probe_perf_disable(struct ftrace_event_call *call)
> -{
> - struct trace_probe *tp = (struct trace_probe *)call->data;
> -
> - tp->flags &= ~TP_FLAG_PROFILE;
> -
> - if (!(tp->flags & TP_FLAG_TRACE)) {
> - if (trace_probe_is_return(tp))
> - disable_kretprobe(&tp->rp);
> - else
> - disable_kprobe(&tp->rp.kp);
> - }
> -}
> #endif /* CONFIG_PERF_EVENTS */
>
> static __kprobes
> int kprobe_register(struct ftrace_event_call *event, enum trace_reg type)
> {
> + struct trace_probe *tp = (struct trace_probe *)event->data;
> +
> switch (type) {
> case TRACE_REG_REGISTER:
> - return probe_event_enable(event);
> + return enable_trace_probe(tp, TP_FLAG_TRACE);
> case TRACE_REG_UNREGISTER:
> - probe_event_disable(event);
> + disable_trace_probe(tp, TP_FLAG_TRACE);
> return 0;
>
> #ifdef CONFIG_PERF_EVENTS
> case TRACE_REG_PERF_REGISTER:
> - return probe_perf_enable(event);
> + return enable_trace_probe(tp, TP_FLAG_PROFILE);
> case TRACE_REG_PERF_UNREGISTER:
> - probe_perf_disable(event);
> + disable_trace_probe(tp, TP_FLAG_PROFILE);
> return 0;
> #endif
> }
> @@ -1905,7 +1885,7 @@ static __init int kprobe_trace_self_tests_init(void)
> pr_warning("error on getting new probe.\n");
> warn++;
> } else
> - probe_event_enable(&tp->call);
> + enable_trace_probe(tp, TP_FLAG_TRACE);
> }
>
> ret = command_trace_probe("r:testprobe2 kprobe_trace_selftest_target "
> @@ -1920,7 +1900,7 @@ static __init int kprobe_trace_self_tests_init(void)
> pr_warning("error on getting new probe.\n");
> warn++;
> } else
> - probe_event_enable(&tp->call);
> + enable_trace_probe(tp, TP_FLAG_TRACE);
> }
>
> if (warn)
--
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