Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565AbZCSVMJ (ORCPT ); Thu, 19 Mar 2009 17:12:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761017AbZCSVKE (ORCPT ); Thu, 19 Mar 2009 17:10:04 -0400 Received: from mx2.redhat.com ([66.187.237.31]:33475 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761053AbZCSVKB (ORCPT ); Thu, 19 Mar 2009 17:10:01 -0400 Message-ID: <49C2B4D9.6040602@redhat.com> Date: Thu, 19 Mar 2009 17:10:49 -0400 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Steven Rostedt , Ananth N Mavinakayanahalli , Ingo Molnar CC: systemtap-ml , LKML Subject: [RFC][PATCH -tip 9/9] tracing: kprobe-tracer plugin supports module_probe X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2263 Lines: 75 Use register/unregister_module_*probe functions for tracing module .init/.exit functions. Signed-off-by: Masami Hiramatsu Cc: Steven Rostedt Cc: Ananth N Mavinakayanahalli Cc: Ingo Molnar --- kernel/trace/trace_kprobe.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index e801e8c..7b7ab53 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -226,6 +226,11 @@ static void free_trace_probe(struct trace_probe *tp) kfree(tp); } +static int activate_handler(void *offset, struct module *mod) +{ + return ((unsigned long)offset == 0) ? 1 : 0; +} + static int register_trace_probe(struct trace_probe *tp) { int ret; @@ -234,9 +239,10 @@ static int register_trace_probe(struct trace_probe *tp) list_add_tail(&tp->list, &probe_list); if (probe_is_return(tp)) - ret = register_kretprobe(&tp->rp); + ret = register_module_kretprobe(&tp->rp, activate_handler, 0); else - ret = register_kprobe(&tp->kp); + ret = register_module_kprobe(&tp->kp, activate_handler, + (void *)(tp->kp.offset)); if (ret) { pr_warning("Probe registering error: %d\n", ret); @@ -249,9 +255,9 @@ static int register_trace_probe(struct trace_probe *tp) static void unregister_trace_probe(struct trace_probe *tp) { if (probe_is_return(tp)) - unregister_kretprobe(&tp->rp); + unregister_module_kretprobe(&tp->rp); else - unregister_kprobe(&tp->kp); + unregister_module_kprobe(&tp->kp); list_del(&tp->list); } @@ -301,7 +307,6 @@ static int create_trace_probe(int argc, char **argv) } else { /* a symbol specified */ symbol = argv[1]; - /* TODO: support .init module functions */ tmp = strchr(symbol, '+'); if (!tmp) tmp = strchr(symbol, '-'); -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/