From patchwork Thu Oct 8 08:29:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 54639 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 34FD022FFC for ; Thu, 8 Oct 2015 08:38:14 +0000 (UTC) Received: by wibzt1 with SMTP id zt1sf1177858wib.2 for ; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=smNMYm6IGsR7wp1QJRUUC+zcLOX9+nPpz5BH+Pbzf70=; b=Mm+mr+LhYgh8D25x9EF0wbt1Arv9ARu02iPvwkQjuKmY0t3UKlKImwlt1xUEgrCXee Oex4Wwyjmta8fwy/MNOu7d0gLWanzALcYV2KihvJerkiqxTW2z+nQOjTqqoPoLT9ahRm 8t9rZKPISytrQ2bqAjzAmuYkajGZL/vfv95ma9d2W3g8KrrPTLUtLezoQFTwDmWBHXlx FLHtGAM6NxfOsudhbUtomXhjaVNF95O202o36FDkPSyUkoPhe/75XyJRpIfFoKHIUdXr zzqhFFqX31QYXigo7riqKiER3tW6e3I4iUTlaXaefxlUYwqYz/a8zxag7aa1PRMPYSYk IUSg== X-Gm-Message-State: ALoCoQmQub/TflYaY0huUEnJqtWM5ZpS+JOlXN9NTncrexZx4/+HqZihi3zN3DW7FMYDb0E4astI X-Received: by 10.194.240.230 with SMTP id wd6mr1135867wjc.0.1444293493491; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.40.133 with SMTP id o127ls154355lfo.38.gmail; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) X-Received: by 10.112.144.101 with SMTP id sl5mr2930480lbb.115.1444293493305; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id 25si28808140lfv.152.2015.10.08.01.38.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 01:38:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbos8 with SMTP id s8so38357698lbo.0 for ; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) X-Received: by 10.25.38.9 with SMTP id m9mr1919311lfm.112.1444293493093; Thu, 08 Oct 2015 01:38:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp440916lbq; Thu, 8 Oct 2015 01:38:12 -0700 (PDT) X-Received: by 10.66.231.103 with SMTP id tf7mr6763131pac.85.1444293491108; Thu, 08 Oct 2015 01:38:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id de10si64742809pad.66.2015.10.08.01.38.10; Thu, 08 Oct 2015 01:38:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbbJHIiI (ORCPT + 30 others); Thu, 8 Oct 2015 04:38:08 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:55050 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754642AbbJHIiE (ORCPT ); Thu, 8 Oct 2015 04:38:04 -0400 Received: from 172.24.1.49 (EHLO szxeml427-hub.china.huawei.com) ([172.24.1.49]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BOO15954; Thu, 08 Oct 2015 16:30:50 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.235.1; Thu, 8 Oct 2015 16:29:42 +0800 From: Wang Nan To: CC: , , , Wang Nan , Alexei Starovoitov , Brendan Gregg , Daniel Borkmann , David Ahern , He Kuang , Jiri Olsa , Kaixu Xia , Masami Hiramatsu , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 18/22] perf tools: Use same BPF program if arguments are identical Date: Thu, 8 Oct 2015 08:29:40 +0000 Message-ID: <1444292984-13135-19-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1444292984-13135-1-git-send-email-wangnan0@huawei.com> References: <1444292984-13135-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56162A83.00A2, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: d0cb1755e2970244e997caea51baec32 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch allows creating only one BPF program for different 'probe_trace_event'(tev) generated by one 'perf_probe_event'(pev), if their prologues are identical. This is done by comparing argument list of different tev, and maps type of prologue and tev using a mapping array. This patch utilizes qsort to sort tevs. After sorting, tevs with identical argument list will be grouped together. Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Cc: Arnaldo Carvalho de Melo Link: http://lkml.kernel.org/n/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org --- tools/perf/util/bpf-loader.c | 133 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index c363907..af549ea 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -37,6 +37,8 @@ struct bpf_prog_priv { struct perf_probe_event pev; bool need_prologue; struct bpf_insn *insns_buf; + int nr_types; + int *type_mapping; }; struct bpf_object * @@ -104,6 +106,7 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused, cleanup_perf_probe_events(&priv->pev, 1); zfree(&priv->insns_buf); + zfree(&priv->type_mapping); free(priv); } @@ -205,7 +208,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n, struct bpf_prog_priv *priv; struct bpf_insn *buf; size_t prologue_cnt = 0; - int err; + int i, err; err = bpf_program__get_private(prog, (void **)&priv); if (err || !priv) @@ -213,10 +216,20 @@ preproc_gen_prologue(struct bpf_program *prog, int n, pev = &priv->pev; - if (n < 0 || n >= pev->ntevs) + if (n < 0 || n >= priv->nr_types) goto errout; - tev = &pev->tevs[n]; + /* Find a tev belongs to that type */ + for (i = 0; i < pev->ntevs; i++) + if (priv->type_mapping[i] == n) + break; + + if (i >= pev->ntevs) { + pr_debug("Internal error: prologue type %d not found\n", n); + return -ENOENT; + } + + tev = &pev->tevs[i]; buf = priv->insns_buf; err = bpf__gen_prologue(tev->args, tev->nargs, @@ -247,6 +260,98 @@ errout: return -EINVAL; } +/* + * compare_tev_args is reflexive, transitive and antisymmetric. + * I can show that but this margin is too narrow to contain. + */ +static int compare_tev_args(const void *ptev1, const void *ptev2) +{ + int i, ret; + const struct probe_trace_event *tev1 = + *(const struct probe_trace_event **)ptev1; + const struct probe_trace_event *tev2 = + *(const struct probe_trace_event **)ptev2; + + ret = tev2->nargs - tev1->nargs; + if (ret) + return ret; + + for (i = 0; i < tev1->nargs; i++) { + struct probe_trace_arg *arg1, *arg2; + struct probe_trace_arg_ref *ref1, *ref2; + + arg1 = &tev1->args[i]; + arg2 = &tev2->args[i]; + + ret = strcmp(arg1->value, arg2->value); + if (ret) + return ret; + + ref1 = arg1->ref; + ref2 = arg2->ref; + + while (ref1 && ref2) { + ret = ref2->offset - ref1->offset; + if (ret) + return ret; + + ref1 = ref1->next; + ref2 = ref2->next; + } + + if (ref1 || ref2) + return ref2 ? 1 : -1; + } + + return 0; +} + +static int map_prologue(struct perf_probe_event *pev, int *mapping, + int *nr_types) +{ + int i, type = 0; + struct { + struct probe_trace_event *tev; + int idx; + } *stevs; + size_t array_sz = sizeof(*stevs) * pev->ntevs; + + stevs = malloc(array_sz); + if (!stevs) { + pr_debug("No ehough memory: alloc stevs failed\n"); + return -ENOMEM; + } + + pr_debug("In map_prologue, ntevs=%d\n", pev->ntevs); + for (i = 0; i < pev->ntevs; i++) { + stevs[i].tev = &pev->tevs[i]; + stevs[i].idx = i; + } + qsort(stevs, pev->ntevs, sizeof(*stevs), + compare_tev_args); + + for (i = 0; i < pev->ntevs; i++) { + if (i == 0) { + mapping[stevs[i].idx] = type; + pr_debug("mapping[%d]=%d\n", stevs[i].idx, + type); + continue; + } + + if (compare_tev_args(stevs + i, stevs + i - 1) == 0) + mapping[stevs[i].idx] = type; + else + mapping[stevs[i].idx] = ++type; + + pr_debug("mapping[%d]=%d\n", stevs[i].idx, + mapping[stevs[i].idx]); + } + free(stevs); + *nr_types = type + 1; + + return 0; +} + static int hook_load_preprocessor(struct bpf_program *prog) { struct perf_probe_event *pev; @@ -286,7 +391,19 @@ static int hook_load_preprocessor(struct bpf_program *prog) return -ENOMEM; } - err = bpf_program__set_prep(prog, pev->ntevs, + priv->type_mapping = malloc(sizeof(int) * pev->ntevs); + if (!priv->type_mapping) { + pr_debug("No enough memory: alloc type_mapping failed\n"); + return -ENOMEM; + } + memset(priv->type_mapping, 0xff, + sizeof(int) * pev->ntevs); + + err = map_prologue(pev, priv->type_mapping, &priv->nr_types); + if (err) + return err; + + err = bpf_program__set_prep(prog, priv->nr_types, preproc_gen_prologue); return err; } @@ -420,9 +537,11 @@ int bpf__foreach_tev(struct bpf_object *obj, for (i = 0; i < pev->ntevs; i++) { tev = &pev->tevs[i]; - if (priv->need_prologue) - fd = bpf_program__nth_fd(prog, i); - else + if (priv->need_prologue) { + int type = priv->type_mapping[i]; + + fd = bpf_program__nth_fd(prog, type); + } else fd = bpf_program__fd(prog); if (fd < 0) {