mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <namhyung@kernel.org>, <alexei.starovoitov@gmail.com>,
	<masami.hiramatsu.pt@hitachi.com>, <acme@kernel.org>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
	<jolsa@kernel.org>, <dsahern@gmail.com>, <daniel@iogearbox.net>,
	<brendan.d.gregg@gmail.com>
Cc: <lizefan@huawei.com>, <hekuang@huawei.com>, <xiakaixu@huawei.com>,
	<linux-kernel@vger.kernel.org>, <pi3orama@163.com>
Subject: [RFC PATCH v5 14/30] bpf tools: Record map accessing instructions for each program
Date: Mon, 1 Jun 2015 07:38:00 +0000	[thread overview]
Message-ID: <1433144296-74992-15-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1433144296-74992-1-git-send-email-wangnan0@huawei.com>

This patch records the indics of instructions which are needed to be
relocated. Those information are saved in 'reloc_desc' field in
'struct bpf_program'. In loading phase (this patch takes effect in
opening phase), the collected instructions will be replaced by
map loading instructions.

Since we are going to close the ELF file and clear all data at the end
of 'opening' phase, ELF information will no longer be valid in
'loading' phase. We have to locate the instructions before maps are
loaded, instead of directly modifying the instruction.

'struct bpf_map_def' is introduce in this patch to let us know how many
maps defined in the object.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
 tools/lib/bpf/libbpf.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
 tools/lib/bpf/libbpf.h |  13 ++++++
 2 files changed, 137 insertions(+)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index a761b34..7d871ca 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -88,6 +89,12 @@ struct bpf_program {
 	char *section_name;
 	struct bpf_insn *insns;
 	size_t insns_cnt;
+
+	struct {
+		int insn_idx;
+		int map_idx;
+	} *reloc_desc;
+	int nr_reloc;
 };
 
 struct bpf_object {
@@ -125,6 +132,9 @@ static void bpf_program__clear(struct bpf_program *prog)
 
 	zfree(&prog->section_name);
 	zfree(&prog->insns);
+	zfree(&prog->reloc_desc);
+
+	prog->nr_reloc = 0;
 	prog->insns_cnt = 0;
 	prog->idx = -1;
 }
@@ -447,6 +457,118 @@ out:
 	return err;
 }
 
+static struct bpf_program *
+bpf_object__find_prog_by_idx(struct bpf_object *obj, int idx)
+{
+	struct bpf_program *prog;
+	size_t i;
+
+	for (i = 0; i < obj->nr_programs; i++) {
+		prog = &obj->programs[i];
+		if (prog->idx == idx)
+			return prog;
+	}
+	return NULL;
+}
+
+static int
+bpf_program__collect_reloc(struct bpf_program *prog,
+			   size_t nr_maps, GElf_Shdr *shdr,
+			   Elf_Data *data, Elf_Data *symbols)
+{
+	int i, nrels;
+
+	pr_debug("collecting relocating info for: '%s'\n",
+		 prog->section_name);
+	nrels = shdr->sh_size / shdr->sh_entsize;
+	
+	prog->reloc_desc = malloc(sizeof(*prog->reloc_desc) * nrels);
+	if (!prog->reloc_desc) {
+		pr_warning("failed to alloc memory in relocation\n");
+		return -ENOMEM;
+	}
+	prog->nr_reloc = nrels;
+
+	for (i = 0; i < nrels; i++) {
+		GElf_Sym sym;
+		GElf_Rel rel;
+		unsigned int insn_idx;
+		struct bpf_insn *insns = prog->insns;
+		size_t map_idx;
+
+		if (!gelf_getrel(data, i, &rel)) {
+			pr_warning("relocation: failed to get %d reloc\n", i);
+			return -EINVAL;
+		}
+
+		insn_idx = rel.r_offset / sizeof(struct bpf_insn);
+		pr_debug("relocation: insn_idx=%u\n", insn_idx);
+
+		if (!gelf_getsym(symbols,
+				 GELF_R_SYM(rel.r_info),
+				 &sym)) {
+			pr_warning("relocation: symbol %"PRIx64" not found\n",
+				   GELF_R_SYM(rel.r_info));
+			return -EINVAL;
+		}
+
+		if (insns[insn_idx].code != (BPF_LD | BPF_IMM | BPF_DW)) {
+			pr_warning("bpf: relocation: invalid relo for insns[%d].code 0x%x\n",
+				   insn_idx, insns[insn_idx].code);
+			return -EINVAL;
+		}
+
+		map_idx = sym.st_value / sizeof(struct bpf_map_def);
+		if (map_idx >= nr_maps) {
+			pr_warning("bpf relocation: map_idx %d large than %d\n",
+				   (int)map_idx, (int)nr_maps - 1);
+			return -EINVAL;
+		}
+
+		prog->reloc_desc[i].insn_idx = insn_idx;
+		prog->reloc_desc[i].map_idx = map_idx;
+	}
+	return 0;
+}
+
+static int bpf_object__collect_reloc(struct bpf_object *obj)
+{
+	int i, err;
+
+	if (!obj_elf_valid(obj)) {
+		pr_warning("Internal error: elf object is closed\n");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < obj->efile.nr_reloc; i++) {
+		GElf_Shdr *shdr = &obj->efile.reloc[i].shdr;
+		Elf_Data *data = obj->efile.reloc[i].data;
+		int idx = shdr->sh_info;
+		struct bpf_program *prog;
+		size_t nr_maps = obj->maps_buf_sz /
+				 sizeof(struct bpf_map_def);
+
+		if (shdr->sh_type != SHT_REL) {
+			pr_warning("internal error at %d\n", __LINE__);
+			return -EINVAL;
+		}
+
+		prog = bpf_object__find_prog_by_idx(obj, idx);
+		if (!prog) {
+			pr_warning("relocation failed: no %d section\n",
+				   idx);
+			return -ENOENT;
+		}
+
+		err = bpf_program__collect_reloc(prog, nr_maps,
+						 shdr, data,
+						 obj->efile.symbols);
+		if (err)
+			return -EINVAL;
+	}
+	return 0;
+}
+
 static int bpf_object__validate(struct bpf_object *obj)
 {
 	if (obj->kern_version == 0) {
@@ -482,6 +604,8 @@ struct bpf_object *bpf_object__open(const char *path)
 		goto out;
 	if (bpf_object__elf_collect(obj))
 		goto out;
+	if (bpf_object__collect_reloc(obj))
+		goto out;
 	if (bpf_object__validate(obj))
 		goto out;
 
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index ec3301c..84faa12 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -28,4 +28,17 @@ struct bpf_object;
 struct bpf_object *bpf_object__open(const char *path);
 void bpf_object__close(struct bpf_object *object);
 
+/*
+ * We don't need __attribute__((packed)) now since it is
+ * unnecessary for 'bpf_map_def' because they are all aligned.
+ * In addition, using it will trigger -Wpacked warning message,
+ * and will be treated as an error due to -Werror.
+ */
+struct bpf_map_def {
+	unsigned int type;
+	unsigned int key_size;
+	unsigned int value_size;
+	unsigned int max_entries;
+}; 
+
 #endif
-- 
1.8.3.4


  parent reply	other threads:[~2015-06-01  9:56 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-01  7:37 [RFC PATCH v5 00/30] perf tools: filtering events using eBPF programs Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 01/30] perf tools: Move linux/kernel.h to tools/include Wang Nan
2015-06-04 14:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 02/30] perf tools: Move linux/{list.h,poison.h} " Wang Nan
2015-06-04 14:11   ` [tip:perf/core] tools: Move tools/perf/util/include/linux/{list.h ,poison.h} " tip-bot for Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 03/30] tools build: Add feature check for eBPF API Wang Nan
2015-06-02 22:11   ` Arnaldo Carvalho de Melo
2015-06-03  1:15     ` Wangnan (F)
2015-06-03 13:47       ` Arnaldo Carvalho de Melo
2015-06-01  7:37 ` [RFC PATCH v5 04/30] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 05/30] bpf tools: Allow caller to set printing function Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 06/30] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-03 21:33   ` Arnaldo Carvalho de Melo
2015-06-03 21:35     ` Arnaldo Carvalho de Melo
2015-06-04  2:18       ` Wangnan (F)
2015-06-01  7:37 ` [RFC PATCH v5 07/30] bpf tools: Check endianess and make libbpf fail early Wang Nan
2015-06-03 21:52   ` Arnaldo Carvalho de Melo
2015-06-01  7:37 ` [RFC PATCH v5 08/30] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 09/30] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 10/30] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 11/30] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 12/30] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 13/30] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-01  7:38 ` Wang Nan [this message]
2015-06-01  7:38 ` [RFC PATCH v5 15/30] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 16/30] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 17/30] bpf tools: Relocate eBPF programs Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 18/30] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 19/30] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 20/30] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 21/30] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 22/30] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 23/30] perf tools: Make perf depend on libbpf Wang Nan
2015-06-03  2:45   ` [RFC PATCH v6 " Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 24/30] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 25/30] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 26/30] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 27/30] perf record: Probe at kprobe points Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 28/30] perf record: Load all eBPF object into kernel Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 29/30] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 30/30] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-02  0:48 ` [RFC PATCH v5 00/30] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-02  1:15   ` 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=1433144296-74992-15-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=alexei.starovoitov@gmail.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

all inboxes | Powered by JetHome®