From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756787AbbJ2MWr (ORCPT ); Thu, 29 Oct 2015 08:22:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58149 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756367AbbJ2MWo (ORCPT ); Thu, 29 Oct 2015 08:22:44 -0400 Date: Thu, 29 Oct 2015 05:21:57 -0700 From: tip-bot for Wang Nan Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, xiakaixu@huawei.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, jolsa@kernel.org, wangnan0@huawei.com, acme@redhat.com, daniel@iogearbox.net, namhyung@kernel.org, brendan.d.gregg@gmail.com, dsahern@gmail.com, a.p.zijlstra@chello.nl, lizefan@huawei.com, ast@plumgrid.com Reply-To: acme@redhat.com, wangnan0@huawei.com, jolsa@kernel.org, hekuang@huawei.com, linux-kernel@vger.kernel.org, xiakaixu@huawei.com, mingo@kernel.org, tglx@linutronix.de, masami.hiramatsu.pt@hitachi.com, hpa@zytor.com, ast@plumgrid.com, lizefan@huawei.com, dsahern@gmail.com, a.p.zijlstra@chello.nl, brendan.d.gregg@gmail.com, namhyung@kernel.org, daniel@iogearbox.net In-Reply-To: <1444826502-49291-3-git-send-email-wangnan0@huawei.com> References: <1444826502-49291-3-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf ebpf: Add the libbpf glue Git-Commit-ID: 69d262a93a25cf475012ea2e00aeb29f4932c028 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 69d262a93a25cf475012ea2e00aeb29f4932c028 Gitweb: http://git.kernel.org/tip/69d262a93a25cf475012ea2e00aeb29f4932c028 Author: Wang Nan AuthorDate: Wed, 14 Oct 2015 12:41:13 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 28 Oct 2015 12:48:12 -0300 perf ebpf: Add the libbpf glue The 'bpf-loader.[ch]' files are introduced in this patch. Which will be the interface between perf and libbpf. bpf__prepare_load() resides in bpf-loader.c. Following patches will enrich these two files. Signed-off-by: Wang Nan Acked-by: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1444826502-49291-3-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/bpf-loader.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 29 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c new file mode 100644 index 0000000..ab56073 --- /dev/null +++ b/tools/perf/util/bpf-loader.c @@ -0,0 +1,57 @@ +/* + * bpf-loader.c + * + * Copyright (C) 2015 Wang Nan + * Copyright (C) 2015 Huawei Inc. + */ + +#include +#include +#include "perf.h" +#include "debug.h" +#include "bpf-loader.h" + +#define DEFINE_PRINT_FN(name, level) \ +static int libbpf_##name(const char *fmt, ...) \ +{ \ + va_list args; \ + int ret; \ + \ + va_start(args, fmt); \ + ret = veprintf(level, verbose, pr_fmt(fmt), args);\ + va_end(args); \ + return ret; \ +} + +DEFINE_PRINT_FN(warning, 0) +DEFINE_PRINT_FN(info, 0) +DEFINE_PRINT_FN(debug, 1) + +struct bpf_object *bpf__prepare_load(const char *filename) +{ + struct bpf_object *obj; + static bool libbpf_initialized; + + if (!libbpf_initialized) { + libbpf_set_print(libbpf_warning, + libbpf_info, + libbpf_debug); + libbpf_initialized = true; + } + + obj = bpf_object__open(filename); + if (!obj) { + pr_debug("bpf: failed to load %s\n", filename); + return ERR_PTR(-EINVAL); + } + + return obj; +} + +void bpf__clear(void) +{ + struct bpf_object *obj, *tmp; + + bpf_object__for_each_safe(obj, tmp) + bpf_object__close(obj); +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h new file mode 100644 index 0000000..f402d7c --- /dev/null +++ b/tools/perf/util/bpf-loader.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015, Wang Nan + * Copyright (C) 2015, Huawei Inc. + */ +#ifndef __BPF_LOADER_H +#define __BPF_LOADER_H + +#include +#include +#include +#include "debug.h" + +struct bpf_object; + +#ifdef HAVE_LIBBPF_SUPPORT +struct bpf_object *bpf__prepare_load(const char *filename); + +void bpf__clear(void); +#else +static inline struct bpf_object * +bpf__prepare_load(const char *filename __maybe_unused) +{ + pr_debug("ERROR: eBPF object loading is disabled during compiling.\n"); + return ERR_PTR(-ENOTSUP); +} + +static inline void bpf__clear(void) { } +#endif +#endif