From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v9 47/50] perf tools: Use same BPF program if arguments are identical
Date: Fri, 26 Jun 2015 14:15:52 +0000 [thread overview]
Message-ID: <1435328155-87115-48-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1435328155-87115-1-git-send-email-wangnan0@huawei.com>
This patch allows creating only one BPF program for different tevs
in one pev, if their prologue 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 use qsort to sort
tevs prior type mapping for performance.
Signed-off-by: Wang Nan <wangnan0@hauwei.com>
---
tools/perf/util/bpf-loader.c | 132 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 125 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 24a55b9..aab936b 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -57,6 +57,8 @@ struct bpf_prog_priv {
struct perf_probe_event *pev;
bool need_prologue;
struct bpf_insn *insns_buf;
+ int nr_types;
+ int *type_mapping;
};
static void
@@ -68,6 +70,7 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused,
if (priv->pev)
clear_perf_probe_event(priv->pev);
zfree(&priv->insns_buf);
+ zfree(&priv->type_mapping);
free(priv);
}
@@ -238,7 +241,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)
@@ -246,11 +249,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 belong to that type */
+ for (i = 0; i < pev->ntevs; i++)
+ if (priv->type_mapping[i] == n)
+ break;
+
+ if (i >= pev->ntevs) {
+ pr_err("Internal error: prologue type %d not found\n", n);
+ return -EEXIST;
+ }
+ tev = &pev->tevs[i];
buf = priv->insns_buf;
err = bpf__gen_prologue(tev->args, tev->nargs,
buf, &prologue_cnt,
@@ -280,6 +292,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_err("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;
@@ -320,7 +424,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_err("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;
}
@@ -415,11 +531,13 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)
for (i = 0; i < pev->ntevs; i++) {
tev = &pev->tevs[i];
- if (priv->need_prologue)
+ if (priv->need_prologue) {
+ int type = priv->type_mapping[i];
+
err = bpf_program__get_nth_fd(prog,
- i,
+ type,
&fd);
- else
+ } else
err = bpf_program__get_fd(prog, &fd);
if (err || fd < 0) {
--
1.8.3.4
next prev parent reply other threads:[~2015-06-26 14:21 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 14:15 [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 01/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-27 12:10 ` [PATCH] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-06-27 12:36 ` [PATCH v2] " Wang Nan
2015-06-27 12:11 ` [RFC PATCH v9 01/50 -fix] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 02/50] tools build: Add feature check for eBPF API Wang Nan
2015-06-29 19:21 ` Arnaldo Carvalho de Melo
2015-06-29 19:41 ` Arnaldo Carvalho de Melo
2015-06-30 2:29 ` Wangnan (F)
2015-06-30 14:34 ` Arnaldo Carvalho de Melo
2015-07-01 1:23 ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 03/50] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 20/50] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 23/50] perf tools: Make perf depend on libbpf Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 24/50] perf tools: Introduce llvm config options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 30/50] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 33/50] perf record: Probe at kprobe points Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 44/50] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-06-26 14:15 ` Wang Nan [this message]
2015-06-26 14:15 ` [RFC PATCH v9 48/50] perf record: Support custom vmlinux path Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-06-27 12:25 ` [RFC PATCH v9 49/50 -fix] " Wang Nan
2015-06-29 14:33 ` Arnaldo Carvalho de Melo
2015-06-30 1:38 ` Wangnan (F)
2015-06-30 14:37 ` Arnaldo Carvalho de Melo
2015-07-01 1:31 ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-06-26 22:44 ` [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-27 0:14 ` Wangnan (F)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435328155-87115-48-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ast@plumgrid.com \
--cc=brendan.d.gregg@gmail.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=pi3orama@163.com \
--cc=xiakaixu@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome