public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
	Brendan Gregg <brendan.d.gregg@gmail.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	David Ahern <dsahern@gmail.com>, He Kuang <hekuang@huawei.com>,
	Jiri Olsa <jolsa@kernel.org>, Kaixu Xia <xiakaixu@huawei.com>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Zefan Li <lizefan@huawei.com>,
	pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 23/24] perf tools: Auto detecting kernel include options
Date: Fri,  7 Aug 2015 11:50:31 -0300	[thread overview]
Message-ID: <1438959032-8637-24-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1438959032-8637-1-git-send-email-acme@kernel.org>

From: Wang Nan <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>
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/1436445342-1402-16-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/llvm-utils.c | 60 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index 6bfcb2dd3161..5887bb8c1243 100644
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -246,15 +246,42 @@ static int detect_kbuild_dir(char **kbuild_dir)
 	return -ENOENT;
 }
 
+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");
@@ -271,6 +298,27 @@ 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);
+	force_set_env("KBUILD_OPTS", llvm_param.kbuild_opts);
+	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,
@@ -280,7 +328,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;
 
@@ -302,11 +350,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 ? : ".");
 
 	/*
@@ -330,6 +378,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
@@ -340,6 +389,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;
-- 
2.1.0


  parent reply	other threads:[~2015-08-07 14:53 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-07 14:50 [GIT PULL 00/24] perf/ebpf lib + llvm/clang building infrastructure Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 01/24] bpf tools: Introduce 'bpf' library and add bpf feature check Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 02/24] bpf tools: Allow caller to set printing function Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 03/24] bpf tools: Open eBPF object file and do basic validation Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 04/24] bpf tools: Read eBPF object from buffer Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 05/24] bpf tools: Check endianness and make libbpf fail early Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 06/24] bpf tools: Iterate over ELF sections to collect information Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 07/24] bpf tools: Collect version and license from ELF sections Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 08/24] bpf tools: Collect map definitions from 'maps' section Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 09/24] bpf tools: Collect symbol table from SHT_SYMTAB section Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 10/24] bpf tools: Collect eBPF programs from their own sections Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 11/24] bpf tools: Collect relocation sections from SHT_REL sections Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 12/24] bpf tools: Record map accessing instructions for each program Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 13/24] bpf tools: Add bpf.c/h for common bpf operations Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 14/24] bpf tools: Create eBPF maps defined in an object file Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 15/24] bpf tools: Relocate eBPF programs Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 16/24] bpf tools: Introduce bpf_load_program() to bpf.c Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 17/24] bpf tools: Load eBPF programs in object files into kernel Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 18/24] bpf tools: Introduce accessors for struct bpf_program Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 19/24] bpf tools: Link all bpf objects onto a list Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 20/24] perf tools: Introduce llvm config options Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 21/24] perf tools: Call clang to compile C source to object code Arnaldo Carvalho de Melo
2015-08-07 14:50 ` [PATCH 22/24] perf tools: Auto detecting kernel build directory Arnaldo Carvalho de Melo
2015-08-07 14:50 ` Arnaldo Carvalho de Melo [this message]
2015-08-07 14:50 ` [PATCH 24/24] perf tests: Add LLVM test for eBPF on-the-fly compiling Arnaldo Carvalho de Melo
2015-08-08  8:06 ` [GIT PULL 00/24] perf/ebpf lib + llvm/clang building infrastructure Ingo Molnar

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=1438959032-8637-24-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.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@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=pi3orama@163.com \
    --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