From patchwork Sun Jun 26 11:21:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: He Kuang X-Patchwork-Id: 70881 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp616181qgy; Sun, 26 Jun 2016 04:24:56 -0700 (PDT) X-Received: by 10.98.149.149 with SMTP id c21mr23657152pfk.73.1466940296469; Sun, 26 Jun 2016 04:24:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q14si18958120par.57.2016.06.26.04.24.56; Sun, 26 Jun 2016 04:24:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbcFZLWK (ORCPT + 30 others); Sun, 26 Jun 2016 07:22:10 -0400 Received: from szxga04-in.huawei.com ([58.251.152.52]:21146 "EHLO szxga04-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752381AbcFZLWE (ORCPT ); Sun, 26 Jun 2016 07:22:04 -0400 Received: from 172.24.1.46 (EHLO lggeml424-hub.china.huawei.com) ([172.24.1.46]) by szxrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id BSN99198; Sun, 26 Jun 2016 19:11:00 +0800 (CST) Received: from euler.hulk-profiling (10.107.193.250) by lggeml424-hub.china.huawei.com (10.72.61.34) with Microsoft SMTP Server id 14.3.235.1; Sun, 26 Jun 2016 19:21:40 +0800 From: He Kuang To: , , , , , , , , CC: Subject: [RFC PATCH v2 19/26] perf tools: Register basic uBPF helpers Date: Sun, 26 Jun 2016 11:21:11 +0000 Message-ID: <1466940078-65581-20-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1466940078-65581-1-git-send-email-hekuang@huawei.com> References: <1466940078-65581-1-git-send-email-hekuang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.576FBAD0.0082, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 576e79e11839e05e20af2d489ca73fcf Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Nan Reigster basic extern functions for uBPF programs. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Jiri Olsa Cc: Li Zefan Signed-off-by: He Kuang --- tools/perf/perf.c | 3 ++ tools/perf/util/Build | 1 + tools/perf/util/ubpf-helpers-list.h | 11 ++++++ tools/perf/util/ubpf-helpers.c | 73 +++++++++++++++++++++++++++++++++++++ tools/perf/util/ubpf-helpers.h | 21 +++++++++++ 5 files changed, 109 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 -- 1.8.5.2 diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 8f21922..f4c93c0 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -16,6 +16,7 @@ #include "util/parse-events.h" #include #include "util/bpf-loader.h" +#include "util/ubpf-helpers.h" #include "util/debug.h" #include #include @@ -594,6 +595,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 1d24d94..d12ef7d 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..02ad517 --- /dev/null +++ b/tools/perf/util/ubpf-helpers-list.h @@ -0,0 +1,11 @@ +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..8b83fc8 --- /dev/null +++ b/tools/perf/util/ubpf-helpers.c @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2016, Wang Nan + * Copyright (C) 2016, Huawei Inc. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "ubpf-helpers.h" + +static int __maybe_unused +ubpf_memcmp(void *s1, void *s2, unsigned int n) +{ + return memcmp(s1, s2, n); +} + +static void __maybe_unused +ubpf_memcpy(void *d, void *s, unsigned int n) +{ + memcpy(d, s, n); +} + +static int __maybe_unused +ubpf_strcmp(char *s1, char *s2) +{ + return strcmp(s1, s2); +} + +static int __maybe_unused +ubpf_printf(char *fmt, ...) +{ + int ret; + va_list ap; + + va_start(ap, fmt); + ret = vprintf(fmt, ap); + va_end(ap); + + return ret; +} + +static int __maybe_unused +ubpf_map_lookup_elem(int map_fd, void *key, void *value) +{ + return bpf_map_lookup_elem(map_fd, key, value); +} + +static int __maybe_unused +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 __maybe_unused +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_set_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..7432715 --- /dev/null +++ b/tools/perf/util/ubpf-helpers.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2016, Wang Nan + * 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 +static inline void register_ubpf_helpers(void) {}; +#endif +#endif