linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: wangnan0@huawei.com, hekuang@huawei.com, daniel@iogearbox.net,
	jolsa@kernel.org, namhyung@kernel.org, acme@redhat.com,
	lizefan@huawei.com, hpa@zytor.com, dsahern@gmail.com,
	tglx@linutronix.de, ast@plumgrid.com,
	masami.hiramatsu.pt@hitachi.com, mingo@kernel.org,
	a.p.zijlstra@chello.nl, brendan.d.gregg@gmail.com,
	xiakaixu@huawei.com, linux-kernel@vger.kernel.org
Subject: [tip:perf/core] bpf tools: Collect version and license from ELF sections
Date: Sat, 8 Aug 2015 01:11:34 -0700	[thread overview]
Message-ID: <tip-cb1e5e961991ee9b2cbfd3bf06ef490ea578cd2f@git.kernel.org> (raw)
In-Reply-To: <1435716878-189507-10-git-send-email-wangnan0@huawei.com>

Commit-ID:  cb1e5e961991ee9b2cbfd3bf06ef490ea578cd2f
Gitweb:     http://git.kernel.org/tip/cb1e5e961991ee9b2cbfd3bf06ef490ea578cd2f
Author:     Wang Nan <wangnan0@huawei.com>
AuthorDate: Wed, 1 Jul 2015 02:13:57 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 7 Aug 2015 10:16:57 -0300

bpf tools: Collect version and license from ELF sections

Expand bpf_obj_elf_collect() to collect license and kernel version
information in eBPF object file. eBPF object file should have a section
named 'license', which contains a string. It should also have a section
named 'version', contains a u32 LINUX_VERSION_CODE.

bpf_obj_validate() is introduced to validate object file after loaded.
Currently it only check existence of 'version' section.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kaixu Xia <xiakaixu@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1435716878-189507-10-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/bpf/libbpf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index d8d6eb5..95c8d8e 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -14,6 +14,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <asm/unistd.h>
+#include <linux/kernel.h>
 #include <linux/bpf.h>
 #include <libelf.h>
 #include <gelf.h>
@@ -78,6 +79,8 @@ void libbpf_set_print(libbpf_print_fn_t warn,
 #endif
 
 struct bpf_object {
+	char license[64];
+	u32 kern_version;
 	/*
 	 * Information when doing elf related work. Only valid if fd
 	 * is valid.
@@ -220,6 +223,33 @@ mismatch:
 	return -EINVAL;
 }
 
+static int
+bpf_object__init_license(struct bpf_object *obj,
+			 void *data, size_t size)
+{
+	memcpy(obj->license, data,
+	       min(size, sizeof(obj->license) - 1));
+	pr_debug("license of %s is %s\n", obj->path, obj->license);
+	return 0;
+}
+
+static int
+bpf_object__init_kversion(struct bpf_object *obj,
+			  void *data, size_t size)
+{
+	u32 kver;
+
+	if (size != sizeof(kver)) {
+		pr_warning("invalid kver section in %s\n", obj->path);
+		return -EINVAL;
+	}
+	memcpy(&kver, data, sizeof(kver));
+	obj->kern_version = kver;
+	pr_debug("kernel version of %s is %x\n", obj->path,
+		 obj->kern_version);
+	return 0;
+}
+
 static int bpf_object__elf_collect(struct bpf_object *obj)
 {
 	Elf *elf = obj->efile.elf;
@@ -266,11 +296,32 @@ static int bpf_object__elf_collect(struct bpf_object *obj)
 			 name, (unsigned long)data->d_size,
 			 (int)sh.sh_link, (unsigned long)sh.sh_flags,
 			 (int)sh.sh_type);
+
+		if (strcmp(name, "license") == 0)
+			err = bpf_object__init_license(obj,
+						       data->d_buf,
+						       data->d_size);
+		else if (strcmp(name, "version") == 0)
+			err = bpf_object__init_kversion(obj,
+							data->d_buf,
+							data->d_size);
+		if (err)
+			goto out;
 	}
 out:
 	return err;
 }
 
+static int bpf_object__validate(struct bpf_object *obj)
+{
+	if (obj->kern_version == 0) {
+		pr_warning("%s doesn't provide kernel version\n",
+			   obj->path);
+		return -EINVAL;
+	}
+	return 0;
+}
+
 static struct bpf_object *
 __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz)
 {
@@ -291,6 +342,8 @@ __bpf_object__open(const char *path, void *obj_buf, size_t obj_buf_sz)
 		goto out;
 	if (bpf_object__elf_collect(obj))
 		goto out;
+	if (bpf_object__validate(obj))
+		goto out;
 
 	bpf_object__elf_finish(obj);
 	return obj;

  reply	other threads:[~2015-08-08  8:12 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01  2:13 [RFC PATCH v10 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 01/50] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-08-07  7:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 02/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-08-07  7:16   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 03/50] bpf tools: Introduce 'bpf' library and add bpf feature check Wang Nan
2015-08-08  8:09   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-08-08  8:09   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-08-08  8:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-08-08  8:11   ` tip-bot for Wang Nan [this message]
2015-07-01  2:13 ` [RFC PATCH v10 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-08-08  8:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-07-07 15:10   ` Arnaldo Carvalho de Melo
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-07-07 15:17   ` Arnaldo Carvalho de Melo
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-08-08  8:13   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-08-08  8:13   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 20/50] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-07-07 19:37   ` Arnaldo Carvalho de Melo
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-07-07 19:39   ` Arnaldo Carvalho de Melo
2015-07-01  2:14 ` [RFC PATCH v10 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-07-07 19:47   ` Arnaldo Carvalho de Melo
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 23/50] perf tools: Make perf depend on libbpf Wang Nan
2015-07-07 19:54   ` Arnaldo Carvalho de Melo
2015-07-07 20:16     ` Arnaldo Carvalho de Melo
2015-07-08  2:03       ` Alexei Starovoitov
2015-07-08 13:03         ` Arnaldo Carvalho de Melo
2015-07-08 11:45       ` Wangnan (F)
2015-07-08 13:02         ` Arnaldo Carvalho de Melo
2015-07-01  2:14 ` [RFC PATCH v10 24/50] perf tools: Introduce llvm config options Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 30/50] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 33/50] perf record: Probe at kprobe points Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 44/50] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 47/50] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 48/50] perf record: Support custom vmlinux path Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan

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=tip-cb1e5e961991ee9b2cbfd3bf06ef490ea578cd2f@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangnan0@huawei.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;
as well as URLs for NNTP newsgroup(s).