From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Wang Nan <wangnan0@huawei.com>
Cc: acme@redhat.com, ast@fb.com, lizefan@huawei.com,
hekuang@huawei.com, linux-kernel@vger.kernel.org,
pi3orama@163.com, joe@ovn.org, Jiri Olsa <jolsa@kernel.org>
Subject: Re: [PATCH v3 26/30] perf clang: Link BPF functions declaration into perf
Date: Sat, 26 Nov 2016 09:40:41 -0800 [thread overview]
Message-ID: <20161126174039.GI83987@ast-mbp.thefacebook.com> (raw)
In-Reply-To: <20161126070354.141764-27-wangnan0@huawei.com>
On Sat, Nov 26, 2016 at 07:03:50AM +0000, Wang Nan wrote:
> Use a shell script to generate BPF functions declarations from kernel
> source code, embed the generated header into a C string. Following
> commits will utilizes clang's virtual file system to automatically
> include this header to all BPF scripts.
>
> The generated header is wrapped by a BUILTIN_CLANG_NO_DEFAULT_INCLUDE.
> This macro will be used by following commits to allow user disable this
> and other builtin includes.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Alexei Starovoitov <ast@fb.com>
> Cc: He Kuang <hekuang@huawei.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Zefan Li <lizefan@huawei.com>
> Cc: pi3orama@163.com
> ---
> tools/perf/util/c++/Build | 1 +
> tools/perf/util/c++/bpf-funcs-str.c | 228 +++++++++++++++++++++++++++++++
> tools/perf/util/c++/clang-bpf-includes.h | 12 ++
> 3 files changed, 241 insertions(+)
> create mode 100644 tools/perf/util/c++/bpf-funcs-str.c
> create mode 100644 tools/perf/util/c++/clang-bpf-includes.h
>
> diff --git a/tools/perf/util/c++/Build b/tools/perf/util/c++/Build
> index 988fef1..bd71abf 100644
> --- a/tools/perf/util/c++/Build
> +++ b/tools/perf/util/c++/Build
> @@ -1,2 +1,3 @@
> libperf-$(CONFIG_CLANGLLVM) += clang.o
> libperf-$(CONFIG_CLANGLLVM) += clang-test.o
> +libperf-$(CONFIG_CLANGLLVM) += bpf-funcs-str.o
> diff --git a/tools/perf/util/c++/bpf-funcs-str.c b/tools/perf/util/c++/bpf-funcs-str.c
> new file mode 100644
> index 0000000..f6bcf76
> --- /dev/null
> +++ b/tools/perf/util/c++/bpf-funcs-str.c
> @@ -0,0 +1,228 @@
> +/*
> + * This file is generated by following script:
> + *
> + * #!/bin/bash
> + * TEMP_KBUILD=$(mktemp -d)
> + * KERNEL_DIR=$(pwd)
> + * OUTPUT=tools/perf/util/c++/bpf-funcs-str.c
> + * rm -rf $OUTPUT
> + * echo "Use temp dir: $TEMP_KBUILD"
> + * function finish()
> + * {
> + * rm -rf $TEMP_KBUILD
> + * }
> + * trap finish EXIT
> + * SRCLIST=$(find -name "*.c" | xargs grep bpf_func_proto -l)
> + * cd $TEMP_KBUILD
> + * yes '' | make -C $KERNEL_DIR O=`pwd` oldconfig
> + * cat << EOF >> ./.config
> + * CONFIG_BPF=y
> + * CONFIG_BPF_SYSCALL=y
> + * CONFIG_PERF_EVENTS=y
> + * CONFIG_SOCK_CGROUP_DATA=y
> + * EOF
> + * yes '' | make -C $KERNEL_DIR O=`pwd` oldconfig
> + * FIXOBJLIST=""
> + * for src in ${SRCLIST}
> + * do
> + * mkdir -p $(dirname $src)
> + * cat << EOF > "${src}-fix.c"
> + * #include <linux/init.h>
> + * #undef __init
> + * #define __init __attribute__((constructor))
> + * #include "`basename $src`"
> + * EOF
> + * if [ $(basename $src) == "syscall.c" ]
> + * then
> + * cat << EOF >> "${src}-fix.c"
> + * const struct bpf_verifier_ops *
> + * find_prog_type_export(enum bpf_prog_type type)
> + * {
> + * struct bpf_prog_aux aux;
> + * struct bpf_prog p = {.aux = &aux };
> + * if (find_prog_type(type, &p))
> + * return NULL;
> + * return p.aux->ops;
> + * }
> + * EOF
> + * fi
> + * FIXOBJLIST="$FIXOBJLIST ${src}-fix.o"
> + * done
> + * function dolink()
> + * {
> + * touch ./syms.c
> + * echo gcc kernel/bpf/main.o ./syms.c $FIXOBJLIST -o ./gen
> + * gcc kernel/bpf/main.o ./syms.c $FIXOBJLIST -o ./gen
> + * }
> + * MAIN=kernel/bpf/main.c
> + * cat << EOF > $MAIN
> + * #include <uapi/linux/bpf.h>
> + * #include <linux/bpf.h>
> + * struct bpf_func {
> + * const char *name;
> + * int id;
> + * } bpf_funcs[] = {
> + * EOF
> + * grep '^[[:space:]]BPF_FUNC_[^ ]*,' $KERNEL_DIR/include/uapi/linux/bpf.h | \
> + * sed -e 's/.*BPF_FUNC_\([^,]*\),.*$/\1/g' | \
> + * xargs -n 1 sh -c 'echo {.name = \"$1\", .id = BPF_FUNC_$1}, >> '"$MAIN" sh
> + * cat << EOF >> $MAIN
This is pretty fragile and already broken.
Please just hardcode them as-is. There is no need to be so fancy.
> +"static void *(*bpf_map_lookup_elem)(void *, void *) = (void *)1;\n"
> +"static long (*bpf_map_update_elem)(void *, void *, void *, unsigned long) = (void *)2;\n"
> +"static long (*bpf_map_delete_elem)(void *, void *) = (void *)3;\n"
just hard code this way.
next prev parent reply other threads:[~2016-11-26 17:40 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-26 7:03 [PATCH v3 00/30] perf clang: Builtin clang and perfhook support Wang Nan
2016-11-26 7:03 ` [PATCH v3 01/30] tools lib bpf: Add missing BPF functions Wang Nan
2016-11-26 17:10 ` Alexei Starovoitov
2016-12-02 10:37 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 02/30] tools lib bpf: Add private field for bpf_object Wang Nan
2016-11-26 17:11 ` Alexei Starovoitov
2016-12-02 10:37 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 03/30] tools lib bpf: Retrive bpf_map through offset of bpf_map_def Wang Nan
2016-11-26 17:12 ` Alexei Starovoitov
2016-12-02 10:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 04/30] perf tools: Introduce perf hooks Wang Nan
2016-12-02 10:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 05/30] perf tools: Pass context to perf hook functions Wang Nan
2016-12-06 8:21 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 06/30] perf llvm: Extract helpers in llvm-utils.c Wang Nan
2016-12-06 8:21 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 07/30] tools build: Add feature detection for LLVM Wang Nan
2016-12-06 8:22 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 08/30] tools build: Add feature detection for clang Wang Nan
2016-12-06 8:22 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 09/30] perf build: Add clang and llvm compile and linking support Wang Nan
2016-12-06 8:23 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 10/30] perf clang: Add builtin clang support ant test case Wang Nan
2016-11-26 17:17 ` Alexei Starovoitov
2016-11-28 7:41 ` Wangnan (F)
2016-12-02 15:44 ` Arnaldo Carvalho de Melo
2016-12-05 2:36 ` Wangnan (F)
2016-12-05 4:41 ` Wangnan (F)
2017-01-17 13:38 ` Arnaldo Carvalho de Melo
2016-12-05 16:51 ` Alexei Starovoitov
2016-12-05 21:02 ` Arnaldo Carvalho de Melo
2016-12-05 21:48 ` Arnaldo Carvalho de Melo
2016-12-06 2:07 ` Wangnan (F)
2016-12-06 13:43 ` Arnaldo Carvalho de Melo
2016-12-06 19:19 ` Arnaldo Carvalho de Melo
2016-12-06 21:02 ` Arnaldo Carvalho de Melo
2016-12-06 8:23 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 11/30] perf clang: Use real file system for #include Wang Nan
2016-12-06 8:24 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 12/30] perf clang: Allow passing CFLAGS to builtin clang Wang Nan
2016-12-06 8:25 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 13/30] perf clang: Update test case to use real BPF script Wang Nan
2016-12-06 8:25 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 14/30] perf clang: Support compile IR to BPF object and add testcase Wang Nan
2016-11-26 17:25 ` Alexei Starovoitov
2016-11-28 6:32 ` Wangnan (F)
2016-11-28 10:31 ` Wangnan (F)
2016-11-28 19:33 ` Alexei Starovoitov
2016-12-06 8:26 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 15/30] perf clang: Compile BPF script use builtin clang support Wang Nan
2016-12-06 8:26 ` [tip:perf/core] perf clang: Compile BPF script using " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 16/30] perf clang: Pass full path to builtin clang Wang Nan
2016-11-26 7:03 ` [PATCH v3 17/30] perf clang: Pass CFLAGS " Wang Nan
2016-11-26 7:03 ` [PATCH v3 18/30] perf clang jit: Wrap llvm::Module using PerfModule Wang Nan
2016-11-26 7:03 ` [PATCH v3 19/30] perf clang jit: Insignt BPF and JIT functions in a Module Wang Nan
2016-11-26 17:32 ` Alexei Starovoitov
2016-11-26 7:03 ` [PATCH v3 20/30] perf clang jit: add PerfModule::doJIT to JIT perfhook functions Wang Nan
2016-11-26 17:29 ` Alexei Starovoitov
2016-11-28 6:42 ` Wangnan (F)
2016-11-26 7:03 ` [PATCH v3 21/30] perf clang jit: Export functions for jitted code Wang Nan
2016-11-26 7:03 ` [PATCH v3 22/30] perf clang jit: Actually JIT and hook in bpf loader Wang Nan
2016-11-26 7:03 ` [PATCH v3 23/30] perf clang jit: Collect the lowest address in maps section as map_base Wang Nan
2016-11-26 7:03 ` [PATCH v3 24/30] perf clang jit: Retrive fd of BPF map from its offset Wang Nan
2016-11-26 7:03 ` [PATCH v3 25/30] perf clang jit: Allow jitted perf hook access BPF maps Wang Nan
2016-11-26 17:09 ` Alexei Starovoitov
2016-11-26 7:03 ` [PATCH v3 26/30] perf clang: Link BPF functions declaration into perf Wang Nan
2016-11-26 17:40 ` Alexei Starovoitov [this message]
2016-11-30 16:12 ` Arnaldo Carvalho de Melo
2016-12-01 1:56 ` [PATCH v3 26/30 - cleanup] " Wang Nan
2016-11-26 7:03 ` [PATCH v3 27/30] perf clang: Declare BPF functions for BPF scripts automatically Wang Nan
2016-11-26 7:03 ` [PATCH v3 28/30] perf clang: Include helpers to BPF scripts Wang Nan
2016-11-26 7:03 ` [PATCH v3 29/30] perf clang builtin: Define hook helpers by default Wang Nan
2016-11-26 7:03 ` [PATCH v3 30/30] perf clang jit: Export getpid() to perf hook 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=20161126174039.GI83987@ast-mbp.thefacebook.com \
--to=alexei.starovoitov@gmail.com \
--cc=acme@redhat.com \
--cc=ast@fb.com \
--cc=hekuang@huawei.com \
--cc=joe@ovn.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=pi3orama@163.com \
--cc=wangnan0@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