lkml.org 
[lkml]   [2016]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 11/18] perf tools: Extract helpers in llvm-utils.c
    Date
    Following commits will use builtin clang to compile BPF script.
    llvm__get_kbuild_opts() and llvm__get_nr_cpus() are extracted to help
    building '-DKERNEL_VERSION_CODE' and '-D__NR_CPUS__' macros.

    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>
    ---
    tools/perf/util/llvm-utils.c | 70 ++++++++++++++++++++++++++++++++++++--------
    tools/perf/util/llvm-utils.h | 5 ++++
    2 files changed, 62 insertions(+), 13 deletions(-)

    diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
    index bf7216b..17dffb7 100644
    --- a/tools/perf/util/llvm-utils.c
    +++ b/tools/perf/util/llvm-utils.c
    @@ -7,6 +7,7 @@
    #include <limits.h>
    #include <stdio.h>
    #include <stdlib.h>
    +#include <linux/err.h>
    #include "debug.h"
    #include "llvm-utils.h"
    #include "config.h"
    @@ -282,9 +283,10 @@ static const char *kinc_fetch_script =
    "rm -rf $TMPDIR\n"
    "exit $RET\n";

    -static inline void
    -get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
    +void llvm__get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
    {
    + static char *saved_kbuild_dir;
    + static char *saved_kbuild_include_opts;
    int err;

    if (!kbuild_dir || !kbuild_include_opts)
    @@ -293,10 +295,28 @@ get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
    *kbuild_dir = NULL;
    *kbuild_include_opts = NULL;

    + if (saved_kbuild_dir && saved_kbuild_include_opts &&
    + !IS_ERR(saved_kbuild_dir) && !IS_ERR(saved_kbuild_include_opts)) {
    + *kbuild_dir = strdup(saved_kbuild_dir);
    + *kbuild_include_opts = strdup(saved_kbuild_include_opts);
    +
    + if (*kbuild_dir && *kbuild_include_opts)
    + return;
    +
    + zfree(kbuild_dir);
    + zfree(kbuild_include_opts);
    + /*
    + * Don't fall through: it may breaks saved_kbuild_dir and
    + * saved_kbuild_include_opts if detect them again when
    + * memory is low.
    + */
    + return;
    + }
    +
    if (llvm_param.kbuild_dir && !llvm_param.kbuild_dir[0]) {
    pr_debug("[llvm.kbuild-dir] is set to \"\" deliberately.\n");
    pr_debug("Skip kbuild options detection.\n");
    - return;
    + goto errout;
    }

    err = detect_kbuild_dir(kbuild_dir);
    @@ -306,7 +326,7 @@ get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)
    "Hint:\tSet correct kbuild directory using 'kbuild-dir' option in [llvm]\n"
    " \tsection of ~/.perfconfig or set it to \"\" to suppress kbuild\n"
    " \tdetection.\n\n");
    - return;
    + goto errout;
    }

    pr_debug("Kernel build dir is set to %s\n", *kbuild_dir);
    @@ -325,10 +345,40 @@ get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts)

    free(*kbuild_dir);
    *kbuild_dir = NULL;
    - return;
    + goto errout;
    }

    pr_debug("include option is set to %s\n", *kbuild_include_opts);
    +
    + saved_kbuild_dir = strdup(*kbuild_dir);
    + saved_kbuild_include_opts = strdup(*kbuild_include_opts);
    +
    + if (!saved_kbuild_dir || !saved_kbuild_include_opts) {
    + zfree(&saved_kbuild_dir);
    + zfree(&saved_kbuild_include_opts);
    + }
    + return;
    +errout:
    + saved_kbuild_dir = ERR_PTR(-EINVAL);
    + saved_kbuild_include_opts = ERR_PTR(-EINVAL);
    +}
    +
    +int llvm__get_nr_cpus(void)
    +{
    + static int nr_cpus_avail = 0;
    + char serr[STRERR_BUFSIZE];
    +
    + if (nr_cpus_avail > 0)
    + return nr_cpus_avail;
    +
    + 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", str_error_r(errno, serr, sizeof(serr)));
    + nr_cpus_avail = 128;
    + }
    + return nr_cpus_avail;
    }

    static void
    @@ -406,15 +456,9 @@ 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, &kbuild_include_opts);
    + llvm__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", str_error_r(errno, serr, sizeof(serr)));
    - nr_cpus_avail = 128;
    - }
    + nr_cpus_avail = llvm__get_nr_cpus();
    snprintf(nr_cpus_avail_str, sizeof(nr_cpus_avail_str), "%d",
    nr_cpus_avail);

    diff --git a/tools/perf/util/llvm-utils.h b/tools/perf/util/llvm-utils.h
    index 9f501ce..8a7d588 100644
    --- a/tools/perf/util/llvm-utils.h
    +++ b/tools/perf/util/llvm-utils.h
    @@ -50,4 +50,9 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf, size_t *p_obj_buf_sz);

    /* This function is for test__llvm() use only */
    int llvm__search_clang(void);
    +
    +/* Following functions are reused by builtin clang support */
    +void llvm__get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts);
    +int llvm__get_nr_cpus(void);
    +
    #endif
    --
    1.8.3.4
    \
     
     \ /
      Last update: 2016-09-26 09:30    [W:2.082 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site