lkml.org 
[lkml]   [2016]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 10/13] perf tools: Register basic UBPF helpers
    Date
    Reigster basic extern functions for ubpf programs.

    Signed-off-by: Wang Nan <wangnan0@huawei.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Li Zefan <lizefan@huawei.com>
    ---
    tools/perf/perf.c | 3 ++
    tools/perf/util/Build | 1 +
    tools/perf/util/ubpf-helpers-list.h | 7 ++++
    tools/perf/util/ubpf-helpers.c | 66 +++++++++++++++++++++++++++++++++++++
    tools/perf/util/ubpf-helpers.h | 21 ++++++++++++
    5 files changed, 98 insertions(+)
    create mode 100644 tools/perf/util/ubpf-helpers-list.h
    create mode 100644 tools/perf/util/ubpf-helpers.c
    create mode 100644 tools/perf/util/ubpf-helpers.h

    diff --git a/tools/perf/perf.c b/tools/perf/perf.c
    index 7b2df2b..f246364 100644
    --- a/tools/perf/perf.c
    +++ b/tools/perf/perf.c
    @@ -16,6 +16,7 @@
    #include "util/parse-events.h"
    #include <subcmd/parse-options.h>
    #include "util/bpf-loader.h"
    +#include "util/ubpf-helpers.h"
    #include "util/debug.h"
    #include <api/fs/tracing_path.h>
    #include <pthread.h>
    @@ -618,6 +619,8 @@ int main(int argc, const char **argv)

    perf_debug_setup();

    + register_ubpf_helpers();
    +
    while (1) {
    static int done_help;
    int was_alias = run_argv(&argc, &argv);
    diff --git a/tools/perf/util/Build b/tools/perf/util/Build
    index 90229a8..e193e6b 100644
    --- a/tools/perf/util/Build
    +++ b/tools/perf/util/Build
    @@ -87,6 +87,7 @@ libperf-y += mem-events.o

    libperf-$(CONFIG_LIBBPF) += bpf-loader.o
    libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o
    +libperf-$(CONFIG_UBPF) += ubpf-helpers.o
    libperf-$(CONFIG_LIBELF) += symbol-elf.o
    libperf-$(CONFIG_LIBELF) += probe-file.o
    libperf-$(CONFIG_LIBELF) += probe-event.o
    diff --git a/tools/perf/util/ubpf-helpers-list.h b/tools/perf/util/ubpf-helpers-list.h
    new file mode 100644
    index 0000000..b457963
    --- /dev/null
    +++ b/tools/perf/util/ubpf-helpers-list.h
    @@ -0,0 +1,7 @@
    +DEF_UBPF_HELPER(int, ubpf_memcmp, (void *s1, void *s2, unsigned int n))
    +DEF_UBPF_HELPER(void, ubpf_memcpy, (void *d, void *s, unsigned int size))
    +DEF_UBPF_HELPER(int, ubpf_strcmp, (char *s1, char *s2))
    +DEF_UBPF_HELPER(int, ubpf_printf, (char *fmt, ...))
    +DEF_UBPF_HELPER(int, ubpf_map_lookup_elem, (void *map_desc, void *key, void *value))
    +DEF_UBPF_HELPER(int, ubpf_map_update_elem, (void *map_desc, void *key, void *value, unsigned long long flags))
    +DEF_UBPF_HELPER(int, ubpf_map_get_next_key, (void *map_desc, void *key, void *next_key))
    diff --git a/tools/perf/util/ubpf-helpers.c b/tools/perf/util/ubpf-helpers.c
    new file mode 100644
    index 0000000..b05f495
    --- /dev/null
    +++ b/tools/perf/util/ubpf-helpers.c
    @@ -0,0 +1,66 @@
    +/*
    + * Copyright (C) 2016, Wang Nan <wangnan0@huawei.com>
    + * Copyright (C) 2016, Huawei Inc.
    + */
    +
    +#include <stdio.h>
    +#include <stdlib.h>
    +#include <stdarg.h>
    +#include <string.h>
    +
    +#include <bpf/libbpf.h>
    +#include <bpf/bpf.h>
    +#include <ubpf.h>
    +
    +#include "ubpf-helpers.h"
    +
    +static int ubpf_memcmp(void *s1, void *s2, unsigned int n)
    +{
    + return memcmp(s1, s2, n);
    +}
    +
    +static void ubpf_memcpy(void *d, void *s, unsigned int n)
    +{
    + memcpy(d, s, n);
    +}
    +
    +static int ubpf_strcmp(char *s1, char *s2)
    +{
    + return strcmp(s1, s2);
    +}
    +
    +static int ubpf_printf(char *fmt, ...)
    +{
    + int ret;
    + va_list ap;
    +
    + va_start(ap, fmt);
    + ret = vprintf(fmt, ap);
    + va_end(ap);
    +
    + return ret;
    +}
    +
    +static int ubpf_map_lookup_elem(int map_fd, void *key, void *value)
    +{
    + return bpf_map_lookup_elem(map_fd, key, value);
    +}
    +
    +static int ubpf_map_update_elem(int map_fd, void *key, void *value,
    + unsigned long long flags)
    +{
    + return bpf_map_update_elem(map_fd, key, value, (u64)flags);
    +}
    +
    +static int ubpf_map_get_next_key(int map_fd, void *key, void *next_key)
    +{
    + return bpf_map_get_next_key(map_fd, key, next_key);
    +}
    +
    +void register_ubpf_helpers(void)
    +{
    +#define DEF_UBPF_HELPER(type, name, param) \
    + libbpf_register_ubpf_func(UBPF_FUNC_##name, #name, name);
    +#include "ubpf-helpers-list.h"
    +#undef DEF_UBPF_HELPER
    +}
    diff --git a/tools/perf/util/ubpf-helpers.h b/tools/perf/util/ubpf-helpers.h
    new file mode 100644
    index 0000000..b4e778b
    --- /dev/null
    +++ b/tools/perf/util/ubpf-helpers.h
    @@ -0,0 +1,21 @@
    +/*
    + * Copyright (C) 2016, Wang Nan <wangnan0@huawei.com>
    + * Copyright (C) 2016, Huawei Inc.
    + */
    +#ifndef __UBPF_HELPERS_H
    +#define __UBPF_HELPERS_H
    +
    +#define DEF_UBPF_HELPER(type, name, param) UBPF_FUNC_##name,
    +enum {
    + UBPF_FUNC_unspec = 0,
    +#include "ubpf-helpers-list.h"
    + UBPF_FUNC_MAX
    +};
    +#undef DEF_UBPF_HELPER
    +
    +#ifdef HAVE_UBPF_SUPPORT
    +void register_ubpf_helpers(void);
    +#else
    +inline static void register_ubpf_helpers(void) {};
    +#endif
    +#endif
    --
    1.8.3.4
    \
     
     \ /
      Last update: 2016-04-20 20:21    [W:2.240 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site