Merge branch 'topic/acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[cascardo/linux.git] / tools / perf / util / llvm-utils.c

diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index 4f6a478..00724d4 100644 (file)
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -4,17 +4,18 @@
  */
 
 #include <stdio.h>
-#include <sys/utsname.h>
 #include "util.h"
 #include "debug.h"
 #include "llvm-utils.h"
 #include "cache.h"
 
 #define CLANG_BPF_CMD_DEFAULT_TEMPLATE                         \
-               "$CLANG_EXEC -D__KERNEL__ $CLANG_OPTIONS "      \
-               "$KERNEL_INC_OPTIONS -Wno-unused-value "        \
-               "-Wno-pointer-sign -working-directory "         \
-               "$WORKING_DIR -c \"$CLANG_SOURCE\" -target bpf -O2 -o -"
+               "$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
+               "-DLINUX_VERSION_CODE=$LINUX_VERSION_CODE "     \
+               "$CLANG_OPTIONS $KERNEL_INC_OPTIONS "           \
+               "-Wno-unused-value -Wno-pointer-sign "          \
+               "-working-directory $WORKING_DIR "              \
+               "-c \"$CLANG_SOURCE\" -target bpf -O2 -o -"
 
 struct llvm_param llvm_param = {
        .clang_path = "clang",
@@ -214,18 +215,19 @@ static int detect_kbuild_dir(char **kbuild_dir)
        const char *suffix_dir = "";
 
        char *autoconf_path;
-       struct utsname utsname;
 
        int err;
 
        if (!test_dir) {
-               err = uname(&utsname);
-               if (err) {
-                       pr_warning("uname failed: %s\n", strerror(errno));
+               /* _UTSNAME_LENGTH is 65 */
+               char release[128];
+
+               err = fetch_kernel_version(NULL, release,
+                                          sizeof(release));
+               if (err)
                        return -EINVAL;
-               }
 
-               test_dir = utsname.release;
+               test_dir = release;
                prefix_dir = "/lib/modules/";
                suffix_dir = "/build";
        }
@@ -326,13 +328,15 @@ get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
 int llvm__compile_bpf(const char *path, void **p_obj_buf,
                      size_t *p_obj_buf_sz)
 {
-       int err;
-       char clang_path[PATH_MAX];
+       size_t obj_buf_sz;
+       void *obj_buf = NULL;
+       int err, nr_cpus_avail;
+       unsigned int kernel_version;
+       char linux_version_code_str[64];
        const char *clang_opt = llvm_param.clang_opt;
-       const char *template = llvm_param.clang_bpf_cmd_template;
+       char clang_path[PATH_MAX], nr_cpus_avail_str[64];
        char *kbuild_dir = NULL, *kbuild_include_opts = NULL;
-       void *obj_buf = NULL;
-       size_t obj_buf_sz;
+       const char *template = llvm_param.clang_bpf_cmd_template;
 
        if (!template)
                template = CLANG_BPF_CMD_DEFAULT_TEMPLATE;
@@ -354,6 +358,24 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
         */
        get_kbuild_opts(&kbuild_dir, &kbuild_include_opts);
 
+       nr_cpus_avail = sysconf(_SC_NPROCESSORS_CONF);
+       if (nr_cpus_avail <= 0) {
+               pr_err(
+"WARNING:\tunable to get available CPUs in this system: %s\n"
+"        \tUse 128 instead.\n", strerror(errno));
+               nr_cpus_avail = 128;
+       }
+       snprintf(nr_cpus_avail_str, sizeof(nr_cpus_avail_str), "%d",
+                nr_cpus_avail);
+
+       if (fetch_kernel_version(&kernel_version, NULL, 0))
+               kernel_version = 0;
+
+       snprintf(linux_version_code_str, sizeof(linux_version_code_str),
+                "0x%x", kernel_version);
+
+       force_set_env("NR_CPUS", nr_cpus_avail_str);
+       force_set_env("LINUX_VERSION_CODE", linux_version_code_str);
        force_set_env("CLANG_EXEC", clang_path);
        force_set_env("CLANG_OPTIONS", clang_opt);
        force_set_env("KERNEL_INC_OPTIONS", kbuild_include_opts);