From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [PATCH 15/39] perf tools: Auto detecting kernel include options
Date: Thu, 9 Jul 2015 12:35:18 +0000 [thread overview]
Message-ID: <1436445342-1402-16-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1436445342-1402-1-git-send-email-wangnan0@huawei.com>
To help user find correct kernel include options, this patch extracts
them from kbuild system by an embedded script kinc_fetch_script, which
creates a temporary directory, generates Makefile and an empty dummy.o
then use the Makefile to fetch $(NOSTDINC_FLAGS), $(LINUXINCLUDE) and
$(EXTRA_CFLAGS) options. The result is passed to compiler script using
'KERNEL_INC_OPTIONS' environment variable.
Because options from kbuild contains relative path like
'Iinclude/generated/uapi', the work directory must be changed. This is
done by previous patch.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/perf/util/llvm-utils.c | 59 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 54 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index 2ca2bd6..b658896 100644
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -218,15 +218,42 @@ static const char *kbuild_detector =
"fi\n"
"exit -1\n";
+static const char *kinc_fetch_script =
+"#!/usr/bin/env sh\n"
+"if ! test -d \"$KBUILD_DIR\"\n"
+"then\n"
+" exit -1\n"
+"fi\n"
+"if ! test -f \"$KBUILD_DIR/include/generated/autoconf.h\"\n"
+"then\n"
+" exit -1\n"
+"fi\n"
+"TMPDIR=`mktemp -d`\n"
+"if test -z \"$TMPDIR\"\n"
+"then\n"
+" exit -1\n"
+"fi\n"
+"cat << EOF > $TMPDIR/Makefile\n"
+"obj-y := dummy.o\n"
+"\\$(obj)/%.o: \\$(src)/%.c\n"
+"\t@echo -n \"\\$(NOSTDINC_FLAGS) \\$(LINUXINCLUDE) \\$(EXTRA_CFLAGS)\"\n"
+"EOF\n"
+"touch $TMPDIR/dummy.c\n"
+"make -s -C $KBUILD_DIR M=$TMPDIR $KBUILD_OPTS dummy.o 2>/dev/null\n"
+"RET=$?\n"
+"rm -rf $TMPDIR\n"
+"exit $RET\n";
+
static inline void
-get_kbuild_opts(char **kbuild_dir)
+get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
{
int err;
- if (!kbuild_dir)
+ if (!kbuild_dir || !kbuild_include_opts)
return;
*kbuild_dir = NULL;
+ *kbuild_include_opts = NULL;
if (llvm_param.kbuild_dir && !llvm_param.kbuild_dir[0]) {
pr_debug("[llvm.kbuild-dir] is set to \"\" deliberately.\n");
@@ -247,6 +274,26 @@ get_kbuild_opts(char **kbuild_dir)
" \tdetection.\n\n");
return;
}
+
+ pr_debug("Kernel build dir is set to %s\n", *kbuild_dir);
+ force_set_env("KBUILD_DIR", *kbuild_dir);
+ err = read_from_pipe(kinc_fetch_script,
+ (void **)kbuild_include_opts,
+ NULL);
+ if (err) {
+ pr_warning(
+"WARNING:\tunable to get kernel include directories from '%s'\n"
+"Hint:\tTry set clang include options using 'clang-bpf-cmd-template'\n"
+" \toption in [llvm] section of ~/.perfconfig and set 'kbuild-dir'\n"
+" \toption in [llvm] to \"\" to suppress this detection.\n\n",
+ *kbuild_dir);
+
+ free(*kbuild_dir);
+ *kbuild_dir = NULL;
+ return;
+ }
+
+ pr_debug("include option is set to %s\n", *kbuild_include_opts);
}
int llvm__compile_bpf(const char *path, void **p_obj_buf,
@@ -256,7 +303,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
char clang_path[PATH_MAX];
const char *clang_opt = llvm_param.clang_opt;
const char *template = llvm_param.clang_bpf_cmd_template;
- char *kbuild_dir = NULL;
+ char *kbuild_dir = NULL, *kbuild_include_opts = NULL;
void *obj_buf = NULL;
size_t obj_buf_sz;
@@ -278,11 +325,11 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
* This is an optional work. Even it fail we can continue our
* work. Needn't to check error return.
*/
- get_kbuild_opts(&kbuild_dir);
+ get_kbuild_opts(&kbuild_dir, &kbuild_include_opts);
force_set_env("CLANG_EXEC", clang_path);
force_set_env("CLANG_OPTIONS", clang_opt);
- force_set_env("KERNEL_INC_OPTIONS", NULL);
+ force_set_env("KERNEL_INC_OPTIONS", kbuild_include_opts);
force_set_env("WORKING_DIR", kbuild_dir ? : ".");
/*
@@ -305,6 +352,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
}
free(kbuild_dir);
+ free(kbuild_include_opts);
if (!p_obj_buf)
free(obj_buf);
else
@@ -315,6 +363,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
return 0;
errout:
free(kbuild_dir);
+ free(kbuild_include_opts);
free(obj_buf);
if (p_obj_buf)
*p_obj_buf = NULL;
--
1.8.3.4
next prev parent reply other threads:[~2015-07-09 12:40 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 12:35 [GIT PULL 00/39] perf tools: filtering events using eBPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 01/39] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-07-09 12:35 ` [PATCH 02/39] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-07-09 15:58 ` Arnaldo Carvalho de Melo
2015-07-10 3:07 ` Wangnan (F)
2015-07-13 19:51 ` Arnaldo Carvalho de Melo
2015-07-14 3:58 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 03/39] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-07-09 12:35 ` [PATCH 04/39] bpf tools: Record map accessing instructions for each program Wang Nan
2015-07-09 12:35 ` [PATCH 05/39] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-07-09 12:35 ` [PATCH 06/39] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-07-13 19:54 ` Arnaldo Carvalho de Melo
2015-07-14 3:59 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 07/39] bpf tools: Relocate eBPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 08/39] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-07-09 12:35 ` [PATCH 09/39] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-07-09 12:35 ` [PATCH 10/39] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-07-09 12:35 ` [PATCH 11/39] bpf tools: Link all bpf objects onto a list Wang Nan
2015-07-09 12:35 ` [PATCH 12/39] perf tools: Introduce llvm config options Wang Nan
2015-07-21 11:13 ` [PATCH 12/39 update] " Wang Nan
2015-08-08 8:16 ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-09 12:35 ` [PATCH 13/39] perf tools: Call clang to compile C source to object code Wang Nan
2015-07-09 12:35 ` [PATCH 14/39] perf tools: Auto detecting kernel build directory Wang Nan
2015-07-13 21:46 ` Arnaldo Carvalho de Melo
2015-07-14 6:56 ` Wangnan (F)
2015-07-14 7:16 ` Wangnan (F)
2015-07-09 12:35 ` Wang Nan [this message]
2015-08-08 8:17 ` [tip:perf/core] perf tools: Auto detecting kernel include options tip-bot for Wang Nan
2015-07-09 12:35 ` [PATCH 16/39] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-07-15 10:54 ` [PATCH updated " Wang Nan
2015-07-22 4:46 ` [PATCH 16/39 RESEND] " Wang Nan
2015-07-09 12:35 ` [PATCH 17/39] perf tools: Make perf depend on libbpf Wang Nan
2015-07-09 12:35 ` [PATCH 18/39] perf record: Enable passing bpf object file to --event Wang Nan
2015-07-09 12:35 ` [PATCH 19/39] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-07-09 12:35 ` [PATCH 20/39] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-07-09 12:35 ` [PATCH 21/39] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-07-09 12:35 ` [PATCH 22/39] perf record: Probe at kprobe points Wang Nan
2015-07-09 12:35 ` [PATCH 23/39] perf record: Load all eBPF object into kernel Wang Nan
2015-07-09 12:35 ` [PATCH 24/39] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-07-09 12:35 ` [PATCH 25/39] perf tools: Attach eBPF program to perf event Wang Nan
2015-07-09 12:35 ` [PATCH 26/39] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-07-09 12:35 ` [PATCH 27/39] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-07-09 12:35 ` [PATCH 28/39] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-07-13 5:44 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 29/39] perf tools: Fix probe-event.h include Wang Nan
2015-07-09 12:35 ` [PATCH 30/39] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-07-09 12:35 ` [PATCH 31/39] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-07-09 12:35 ` [PATCH 32/39] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-07-09 12:35 ` [PATCH 33/39] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-07-09 12:35 ` [PATCH 34/39] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-07-09 12:35 ` [PATCH 35/39] perf tools: Generate prologue for BPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 36/39] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-07-09 12:35 ` [PATCH 37/39] perf record: Support custom vmlinux path Wang Nan
2015-07-09 12:35 ` [PATCH 38/39] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-07-09 12:35 ` [PATCH 39/39] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-07-14 15:36 ` perf test LLVM was: Re: [GIT PULL 00/39] perf tools: filtering events using eBPF programs Arnaldo Carvalho de Melo
2015-07-15 10:49 ` Wangnan (F)
2015-07-15 11:20 ` Arnaldo Carvalho de Melo
2015-07-17 2:34 ` Wangnan (F)
[not found] ` <CA+JHD93=ZMFP0gB1NqTXGBjTfSyYC-53Uj7r11gQJnKtQRKcDg@mail.gmail.com>
2015-07-21 11:09 ` Wangnan (F)
2015-07-21 11:41 ` Arnaldo Carvalho de Melo
2015-07-22 4:40 ` Wangnan (F)
2015-07-31 15:35 ` perf eBPF patch ordering. was: " Arnaldo Carvalho de Melo
2015-07-31 20:31 ` Arnaldo Carvalho de Melo
2015-08-03 2:37 ` Wangnan (F)
2015-08-03 15:07 ` Arnaldo Carvalho de Melo
2015-08-03 15:19 ` Arnaldo Carvalho de Melo
2015-08-03 15:53 ` pi3orama
2015-08-03 16:11 ` Arnaldo Carvalho de Melo
2015-08-03 19:49 ` Arnaldo Carvalho de Melo
2015-08-04 5:28 ` Wangnan (F)
2015-08-04 10:39 ` Wangnan (F)
2015-08-04 15:55 ` Arnaldo Carvalho de Melo
2015-08-04 16:11 ` Arnaldo Carvalho de Melo
2015-08-04 16:13 ` pi3orama
2015-08-06 1:44 ` Wangnan (F)
2015-08-06 14:46 ` Arnaldo Carvalho de Melo
2015-08-06 15:58 ` 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=1436445342-1402-16-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=ast@plumgrid.com \
--cc=hekuang@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--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®