From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754566AbbGIMsB (ORCPT ); Thu, 9 Jul 2015 08:48:01 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:33347 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753500AbbGIMpD (ORCPT ); Thu, 9 Jul 2015 08:45:03 -0400 From: Wang Nan To: , CC: , , , , Subject: [PATCH 21/39] perf probe: Attach trace_probe_event with perf_probe_event Date: Thu, 9 Jul 2015 12:35:24 +0000 Message-ID: <1436445342-1402-22-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1436445342-1402-1-git-send-email-wangnan0@huawei.com> References: <1436445342-1402-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.200] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch drops struct __event_package structure. Instead, it adds trace_probe_event into 'struct perf_probe_event'. trace_probe_event information gives further patches a chance to access actual probe points and actual arguments. Using them, bpf_loader will be able to attach one bpf program to different probing points of a inline functions (which has multiple probing points) and glob functions. Moreover, by reading arguments information, bpf code for reading those arguments can be generated. Signed-off-by: Wang Nan --- tools/perf/builtin-probe.c | 4 ++- tools/perf/util/probe-event.c | 60 +++++++++++++++++++++---------------------- tools/perf/util/probe-event.h | 6 ++++- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index b81cec3..826d452 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -496,7 +496,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) usage_with_options(probe_usage, options); } - ret = add_perf_probe_events(params.events, params.nevents); + ret = add_perf_probe_events(params.events, + params.nevents, + true); if (ret < 0) { pr_err_with_code(" Error: Failed to add events.", ret); return ret; diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 381f23a..083e8b4 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -1930,6 +1930,9 @@ void clear_perf_probe_event(struct perf_probe_event *pev) struct perf_probe_arg_field *field, *next; int i; + if (pev->ntevs) + cleanup_perf_probe_event(pev); + free(pev->event); free(pev->group); free(pev->target); @@ -2778,61 +2781,58 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev, return find_probe_trace_events_from_map(pev, tevs); } -struct __event_package { - struct perf_probe_event *pev; - struct probe_trace_event *tevs; - int ntevs; -}; - -int add_perf_probe_events(struct perf_probe_event *pevs, int npevs) +int cleanup_perf_probe_event(struct perf_probe_event *pev) { - int i, j, ret; - struct __event_package *pkgs; + int i; - ret = 0; - pkgs = zalloc(sizeof(struct __event_package) * npevs); + if (!pev || !pev->ntevs) + return 0; - if (pkgs == NULL) - return -ENOMEM; + for (i = 0; i < pev->ntevs; i++) + clear_probe_trace_event(&pev->tevs[i]); + + zfree(&pev->tevs); + pev->ntevs = 0; + return 0; +} + +int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, + bool cleanup) +{ + int i, ret; ret = init_symbol_maps(pevs->uprobes); - if (ret < 0) { - free(pkgs); + if (ret < 0) return ret; - } /* Loop 1: convert all events */ for (i = 0; i < npevs; i++) { - pkgs[i].pev = &pevs[i]; /* Init kprobe blacklist if needed */ - if (!pkgs[i].pev->uprobes) + if (pevs[i].uprobes) kprobe_blacklist__init(); /* Convert with or without debuginfo */ - ret = convert_to_probe_trace_events(pkgs[i].pev, - &pkgs[i].tevs); - if (ret < 0) + ret = convert_to_probe_trace_events(&pevs[i], &pevs[i].tevs); + if (ret < 0) { + cleanup = true; goto end; - pkgs[i].ntevs = ret; + } + pevs[i].ntevs = ret; } /* This just release blacklist only if allocated */ kprobe_blacklist__release(); /* Loop 2: add all events */ for (i = 0; i < npevs; i++) { - ret = __add_probe_trace_events(pkgs[i].pev, pkgs[i].tevs, - pkgs[i].ntevs, + ret = __add_probe_trace_events(&pevs[i], pevs[i].tevs, + pevs[i].ntevs, probe_conf.force_add); if (ret < 0) break; } end: /* Loop 3: cleanup and free trace events */ - for (i = 0; i < npevs; i++) { - for (j = 0; j < pkgs[i].ntevs; j++) - clear_probe_trace_event(&pkgs[i].tevs[j]); - zfree(&pkgs[i].tevs); - } - free(pkgs); + for (i = 0; cleanup && (i < npevs); i++) + cleanup_perf_probe_event(&pevs[i]); exit_symbol_maps(); return ret; diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h index 31db6ee..4b7a951 100644 --- a/tools/perf/util/probe-event.h +++ b/tools/perf/util/probe-event.h @@ -86,6 +86,8 @@ struct perf_probe_event { bool uprobes; /* Uprobe event flag */ char *target; /* Target binary */ struct perf_probe_arg *args; /* Arguments */ + struct probe_trace_event *tevs; + int ntevs; }; /* Line range */ @@ -131,8 +133,10 @@ extern void line_range__clear(struct line_range *lr); /* Initialize line range */ extern int line_range__init(struct line_range *lr); -extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs); +extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, + bool cleanup); extern int del_perf_probe_events(struct strfilter *filter); +extern int cleanup_perf_probe_event(struct perf_probe_event *pev); extern int show_perf_probe_events(struct strfilter *filter); extern int show_line_range(struct line_range *lr, const char *module, bool user); -- 1.8.3.4