All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <masami.hiramatsu.pt@hitachi.com>, <ast@kernel.org>
Cc: <lizefan@huawei.com>, <pi3orama@163.com>,
	<linux-kernel@vger.kernel.org>, Wang Nan <wangnan0@huawei.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 13/13] perf tools: Use same BPF program if arguments are identical
Date: Mon, 16 Nov 2015 12:10:15 +0000	[thread overview]
Message-ID: <1447675815-166222-14-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1447675815-166222-1-git-send-email-wangnan0@huawei.com>

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.

Test result:

Sample BPF program:

 SEC("inlines=no\n"
     "func=SyS_dup? oldfd")
 int func(void *ctx)
 {
     return 1;
 }

It would probe at SyS_dup2 and SyS_dup3, extracts oldfd as its argument.

Following cmdline shows BPF program loaded into kernel by perf:

 # ./perf record  -e  ./test_bpf_arg.c sleep 4 & sleep 1 && ls /proc/$!/fd/ -l | grep bpf-prog

Before this patch:

 # ./perf record  -e  ./test_bpf_arg.c sleep 4 & sleep 1 && ls /proc/$!/fd/ -l | grep bpf-prog
 [1] 24858
 lrwx------ 1 root root 64 Nov 14 04:09 3 -> anon_inode:bpf-prog
 lrwx------ 1 root root 64 Nov 14 04:09 4 -> anon_inode:bpf-prog
 ...

After this patch:

 # ./perf record  -e  ./test_bpf_arg.c sleep 4 & sleep 1 && ls /proc/$!/fd/ -l | grep bpf-prog
 [1] 25699
 lrwx------ 1 root root 64 Nov 14 04:10 3 -> anon_inode:bpf-prog
 ...

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/util/bpf-loader.c | 136 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 129 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index cad0d0f..86c50b9 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -38,6 +38,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 bool libbpf_initialized;
@@ -113,6 +115,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);
 }
 
@@ -381,7 +384,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)
@@ -389,10 +392,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 -BPF_LOADER_ERRNO__PROLOGUE;
+	}
+
+	tev = &pev->tevs[i];
 
 	buf = priv->insns_buf;
 	err = bpf__gen_prologue(tev->args, tev->nargs,
@@ -423,6 +436,101 @@ errout:
 	return -BPF_LOADER_ERRNO__PROLOGUE;
 }
 
+/*
+ * compare_tev_args is reflexive, transitive and antisymmetric.
+ * I can proof it 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;
+}
+
+/*
+ * Assign a type number to each tevs in a pev.
+ * mapping is an array with same slots as tevs in that pev.
+ * nr_types will be set to number of types.
+ */
+static int map_prologue(struct perf_probe_event *pev, int *mapping,
+			int *nr_types)
+{
+	int i, type = 0;
+	struct probe_trace_event **ptevs;
+
+	size_t array_sz = sizeof(*ptevs) * pev->ntevs;
+
+	ptevs = malloc(array_sz);
+	if (!ptevs) {
+		pr_debug("No ehough memory: alloc ptevs failed\n");
+		return -ENOMEM;
+	}
+
+	pr_debug("In map_prologue, ntevs=%d\n", pev->ntevs);
+	for (i = 0; i < pev->ntevs; i++)
+		ptevs[i] = &pev->tevs[i];
+
+	qsort(ptevs, pev->ntevs, sizeof(*ptevs),
+	      compare_tev_args);
+
+	for (i = 0; i < pev->ntevs; i++) {
+		int n;
+
+		n = ptevs[i] - pev->tevs;
+		if (i == 0) {
+			mapping[n] = type;
+			pr_debug("mapping[%d]=%d\n", n, type);
+			continue;
+		}
+
+		if (compare_tev_args(ptevs + i, ptevs + i - 1) == 0)
+			mapping[n] = type;
+		else
+			mapping[n] = ++type;
+
+		pr_debug("mapping[%d]=%d\n", n, mapping[n]);
+	}
+	free(ptevs);
+	*nr_types = type + 1;
+
+	return 0;
+}
+
 static int hook_load_preprocessor(struct bpf_program *prog)
 {
 	struct perf_probe_event *pev;
@@ -462,7 +570,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;
 }
@@ -596,9 +716,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) {
-- 
1.8.3.4


  parent reply	other threads:[~2015-11-16 12:51 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-16 12:10 [PATCH 00/13] perf tools: bpf: Improve BPF program ability Wang Nan
2015-11-16 12:10 ` [PATCH 01/13] perf probe: Fix memory leaking on faiulre by clearing all probe_trace_events Wang Nan
2015-11-16 12:10 ` [PATCH 02/13] perf probe: Clear probe_trace_event when add_probe_trace_event() fails Wang Nan
2015-11-16 12:10 ` [PATCH 03/13] perf tools: Allow BPF program attach to uprobe events Wang Nan
2015-11-16 14:14   ` Arnaldo Carvalho de Melo
2015-11-23 16:06   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 04/13] perf tools: Allow BPF program attach to modules Wang Nan
2015-11-23 16:06   ` [tip:perf/core] perf bpf: Allow attaching BPF programs to modules symbols tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 05/13] perf tools: Introduce strtobool() to string.c Wang Nan
2015-11-16 14:17   ` Arnaldo Carvalho de Melo
2015-11-16 14:49     ` Arnaldo Carvalho de Melo
2015-11-16 15:55       ` Arnaldo Carvalho de Melo
2015-11-23 16:04   ` [tip:perf/core] tools: Clone the kernel's strtobool function tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 06/13] perf tools: Allow BPF program config probing options Wang Nan
2015-11-23 16:06   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 07/13] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-11-16 19:02   ` Arnaldo Carvalho de Melo
2015-11-17  3:53     ` Wangnan (F)
2015-11-23 16:05   ` [tip:perf/core] " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 08/13] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-11-23 16:05   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 09/13] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-11-23 16:05   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 10/13] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-11-23 16:07   ` [tip:perf/core] perf bpf: " tip-bot for He Kuang
2015-11-16 12:10 ` [PATCH 11/13] perf tools: Generate prologue for BPF programs Wang Nan
2015-11-23 16:07   ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-16 12:10 ` [PATCH 12/13] perf test: Test BPF prologue Wang Nan
2015-11-17  1:29   ` Arnaldo Carvalho de Melo
2015-11-17  1:31     ` Wangnan (F)
2015-11-17  4:38     ` Wangnan (F)
2015-11-17 12:20       ` Arnaldo Carvalho de Melo
2015-11-17  8:32     ` [PATCH 0/5] perf tools: Improve BPF support Wang Nan
2015-11-17  8:32       ` [PATCH 1/5] perf test: Fix 2 bugs in 'perf test BPF' Wang Nan
2015-11-17 12:56         ` Arnaldo Carvalho de Melo
2015-11-17 13:01           ` pi3orama
2015-11-17 13:34             ` Arnaldo Carvalho de Melo
2015-11-23 16:08         ` [tip:perf/core] perf test: Fix 'perf test BPF' when it fails to find a suitable vmlinux tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 2/5] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-11-23 16:08         ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 3/5] perf test: Print result for each subtest for llvm Wang Nan
2015-11-17 13:03         ` Arnaldo Carvalho de Melo
2015-11-23 16:09         ` [tip:perf/core] perf test: Print result for each LLVM subtest tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 4/5] perf test: Print result for each subtest for BPF Wang Nan
2015-11-23 16:09         ` [tip:perf/core] perf test: Print result for each BPF subtest tip-bot for Wang Nan
2015-11-17  8:32       ` [PATCH 5/5] perf test: Mute test cases if verbose == 0 Wang Nan
2015-11-17 13:11         ` Arnaldo Carvalho de Melo
2015-11-23 16:10         ` [tip:perf/core] perf test: Mute test cases error messages " tip-bot for Wang Nan
2015-11-17  8:38     ` [PATCH 12/13] perf test: Test BPF prologue Wangnan (F)
2015-11-17  9:44     ` [PATCH] perf record: Support custom vmlinux path Wang Nan
2015-11-17 12:33       ` Arnaldo Carvalho de Melo
2015-11-17 12:42         ` Arnaldo Carvalho de Melo
2015-11-17 12:45           ` pi3orama
2015-11-19 14:03           ` [PATCH 0/2] perf tools: Builtin options related improvements Wang Nan
2015-11-19 14:03             ` [PATCH 1/2] perf tools: Always give options even it not compiled Wang Nan
2015-11-20 10:54               ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-26  8:05                 ` Wangnan (F)
2015-11-26  9:06                   ` Wangnan (F)
2015-11-19 14:03             ` [PATCH 2/2] perf record: Support custom vmlinux path Wang Nan
2015-11-23 16:08   ` [tip:perf/core] perf test: Test the BPF prologue adding infrastructure tip-bot for Wang Nan
2015-11-16 12:10 ` Wang Nan [this message]
2015-11-17  3:05   ` [PATCH 13/13] perf tools: Use same BPF program if arguments are identical Wangnan (F)
2015-11-17 13:16     ` Arnaldo Carvalho de Melo
2015-11-16 14:09 ` [PATCH 00/13] perf tools: bpf: Improve BPF program ability Arnaldo Carvalho de Melo

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=1447675815-166222-14-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=pi3orama@163.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.