All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, ast@plumgrid.com,
	xiakaixu@huawei.com, wangnan0@huawei.com, tglx@linutronix.de,
	dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com,
	lizefan@huawei.com, brendan.d.gregg@gmail.com,
	masami.hiramatsu.pt@hitachi.com, a.p.zijlstra@chello.nl,
	daniel@iogearbox.net, acme@redhat.com, namhyung@kernel.org,
	mingo@kernel.org, hekuang@huawei.com
Subject: [tip:perf/core] bpf tools: Add bpf.c/h for common bpf operations
Date: Sat, 8 Aug 2015 01:13:39 -0700	[thread overview]
Message-ID: <tip-e3ed2fef22b694cf07b06abaa6481a9e6f868e1f@git.kernel.org> (raw)
In-Reply-To: <1435716878-189507-16-git-send-email-wangnan0@huawei.com>

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

bpf tools: Add bpf.c/h for common bpf operations

This patch introduces bpf.c and bpf.h, which hold common functions
issuing bpf syscall. The goal of these two files is to hide syscall
completely from user. Note that bpf.c and bpf.h deal with kernel
interface only. Things like structure of 'map' section in the ELF object
is not cared by of bpf.[ch].

We first introduce bpf_create_map().

Note that, since functions in bpf.[ch] are wrapper of sys_bpf, they
don't use OO style naming.

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-16-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/bpf/Build |  2 +-
 tools/lib/bpf/bpf.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/lib/bpf/bpf.h | 16 ++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/tools/lib/bpf/Build b/tools/lib/bpf/Build
index a316484..d874975 100644
--- a/tools/lib/bpf/Build
+++ b/tools/lib/bpf/Build
@@ -1 +1 @@
-libbpf-y := libbpf.o
+libbpf-y := libbpf.o bpf.o
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
new file mode 100644
index 0000000..208de7c3
--- /dev/null
+++ b/tools/lib/bpf/bpf.c
@@ -0,0 +1,51 @@
+/*
+ * common eBPF ELF operations.
+ *
+ * Copyright (C) 2013-2015 Alexei Starovoitov <ast@kernel.org>
+ * Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
+ * Copyright (C) 2015 Huawei Inc.
+ */
+
+#include <stdlib.h>
+#include <memory.h>
+#include <unistd.h>
+#include <asm/unistd.h>
+#include <linux/bpf.h>
+#include "bpf.h"
+
+/*
+ * When building perf, unistd.h is override. Define __NR_bpf is
+ * required to be defined.
+ */
+#ifndef __NR_bpf
+# if defined(__i386__)
+#  define __NR_bpf 357
+# elif defined(__x86_64__)
+#  define __NR_bpf 321
+# elif defined(__aarch64__)
+#  define __NR_bpf 280
+# else
+#  error __NR_bpf not defined. libbpf does not support your arch.
+# endif
+#endif
+
+static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
+		   unsigned int size)
+{
+	return syscall(__NR_bpf, cmd, attr, size);
+}
+
+int bpf_create_map(enum bpf_map_type map_type, int key_size,
+		   int value_size, int max_entries)
+{
+	union bpf_attr attr;
+
+	memset(&attr, '\0', sizeof(attr));
+
+	attr.map_type = map_type;
+	attr.key_size = key_size;
+	attr.value_size = value_size;
+	attr.max_entries = max_entries;
+
+	return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
+}
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
new file mode 100644
index 0000000..28f7942
--- /dev/null
+++ b/tools/lib/bpf/bpf.h
@@ -0,0 +1,16 @@
+/*
+ * common eBPF ELF operations.
+ *
+ * Copyright (C) 2013-2015 Alexei Starovoitov <ast@kernel.org>
+ * Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
+ * Copyright (C) 2015 Huawei Inc.
+ */
+#ifndef __BPF_BPF_H
+#define __BPF_BPF_H
+
+#include <linux/bpf.h>
+
+int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size,
+		   int max_entries);
+
+#endif

  reply	other threads:[~2015-08-08  8:14 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:perf/core] " tip-bot for Wang Nan
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-bot for Wang Nan [this message]
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-e3ed2fef22b694cf07b06abaa6481a9e6f868e1f@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 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.