From patchwork Sun Sep 6 07:13:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 53169 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id D980A22B05 for ; Sun, 6 Sep 2015 07:15:27 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf16482095wic.3 for ; Sun, 06 Sep 2015 00:15:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=TCz+2C1LvGRowKUH0vJ73T49j0BiPD4WCFuRPQ/Gukk=; b=WSF3njsyG8GaT1F7KuTV5ViHfEio8hh4xgHvNbfJe89l4K+Kf4qxlSWslGixcT0O4u 3adgyQ1P2ZscTtgZmOjIiDiQGe487TLUTLGVnVDJoKpU1XdajFDl7c3ynWLH53L3kkmL R1eGpgwYHOSKQxS+/c8cnRF2RHIMhtYMKZTqKYytiaQ6RztfZ+z+fGmS6Iqmt7MJeJvX L9YTf4Seivjgd1+u3djkid01JK1X1ilT/ia7IAmUv8p+7jN1IQljLRLJ9VpGjgHhXY/P SipA24J8xyGVoD/vGlPFlrc39MSE3Yz+AK4T6RQvS0YjbxWXR1C1OjBNNExg0lECIJAO PFyg== X-Gm-Message-State: ALoCoQk1N4S5bchkDPJFm6CLSvYp87X7QAAXI8Vodxz12248z8/OghPcBewQYn8+ETvv3Re0tiyJ X-Received: by 10.194.19.33 with SMTP id b1mr3334521wje.6.1441523727205; Sun, 06 Sep 2015 00:15:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.200 with SMTP id la8ls222079lac.96.gmail; Sun, 06 Sep 2015 00:15:26 -0700 (PDT) X-Received: by 10.112.53.231 with SMTP id e7mr10619306lbp.103.1441523726739; Sun, 06 Sep 2015 00:15:26 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id wn6si7229840lbb.70.2015.09.06.00.15.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Sep 2015 00:15:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbcao8 with SMTP id ao8so26887713lbc.3 for ; Sun, 06 Sep 2015 00:15:26 -0700 (PDT) X-Received: by 10.152.170.230 with SMTP id ap6mr11671288lac.73.1441523726619; Sun, 06 Sep 2015 00:15:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.164.42 with SMTP id yn10csp843492lbb; Sun, 6 Sep 2015 00:15:25 -0700 (PDT) X-Received: by 10.66.191.232 with SMTP id hb8mr30300135pac.22.1441523725349; Sun, 06 Sep 2015 00:15:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id je10si12075870pbd.171.2015.09.06.00.15.24; Sun, 06 Sep 2015 00:15:25 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751977AbbIFHPU (ORCPT + 28 others); Sun, 6 Sep 2015 03:15:20 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:7348 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbbIFHOk (ORCPT ); Sun, 6 Sep 2015 03:14:40 -0400 Received: from 172.24.1.48 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.48]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUK94019; Sun, 06 Sep 2015 15:14:05 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Sun, 6 Sep 2015 15:13:56 +0800 From: Wang Nan To: , , , CC: , , , , , , , , , , , Subject: [PATCH 03/27] perf ebpf: Add the libbpf glue Date: Sun, 6 Sep 2015 07:13:19 +0000 Message-ID: <1441523623-152703-4-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1441523623-152703-1-git-send-email-wangnan0@huawei.com> References: <1441523623-152703-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Dummy functions should be used because bpf-loader.c is available only when CONFIG_LIBBPF is on. Functions in bpf-loader.c should not report error explicitly. Instead, strerror style error reporting should be used. 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/n/1436445342-1402-19-git-send-email-wangnan0@huawei.com [ split from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/bpf-loader.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 47 ++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 tools/perf/util/bpf-loader.c create mode 100644 tools/perf/util/bpf-loader.h diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c new file mode 100644 index 0000000..88531ea --- /dev/null +++ b/tools/perf/util/bpf-loader.c @@ -0,0 +1,92 @@ +/* + * bpf-loader.c + * + * Copyright (C) 2015 Wang Nan + * Copyright (C) 2015 Huawei Inc. + */ + +#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) + +static bool libbpf_initialized; + +int bpf__prepare_load(const char *filename) +{ + struct bpf_object *obj; + + if (!libbpf_initialized) + libbpf_set_print(libbpf_warning, + libbpf_info, + libbpf_debug); + + obj = bpf_object__open(filename); + if (!obj) { + pr_debug("bpf: failed to load %s\n", filename); + return -EINVAL; + } + + /* + * Throw object pointer away: it will be retrived using + * bpf_objects iterater. + */ + + return 0; +} + +void bpf__clear(void) +{ + struct bpf_object *obj, *tmp; + + bpf_object__for_each_safe(obj, tmp) + bpf_object__close(obj); +} + +#define bpf__strerror_head(err, buf, size) \ + char sbuf[STRERR_BUFSIZE], *emsg;\ + if (!size)\ + return 0;\ + if (err < 0)\ + err = -err;\ + emsg = strerror_r(err, sbuf, sizeof(sbuf));\ + switch (err) {\ + default:\ + scnprintf(buf, size, "%s", emsg);\ + break; + +#define bpf__strerror_entry(val, fmt...)\ + case val: {\ + scnprintf(buf, size, fmt);\ + break;\ + } + +#define bpf__strerror_end(buf, size)\ + }\ + buf[size - 1] = '\0'; + +int bpf__strerror_prepare_load(const char *filename, int err, + char *buf, size_t size) +{ + bpf__strerror_head(err, buf, size); + bpf__strerror_entry(EINVAL, "%s: BPF object file '%s' is invalid", + emsg, filename) + bpf__strerror_end(buf, size); + return 0; +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h new file mode 100644 index 0000000..12be630 --- /dev/null +++ b/tools/perf/util/bpf-loader.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2015, Wang Nan + * Copyright (C) 2015, Huawei Inc. + */ +#ifndef __BPF_LOADER_H +#define __BPF_LOADER_H + +#include +#include +#include "debug.h" + +#ifdef HAVE_LIBBPF_SUPPORT +int bpf__prepare_load(const char *filename); +int bpf__strerror_prepare_load(const char *filename, int err, + char *buf, size_t size); + +void bpf__clear(void); +#else +static inline int bpf__prepare_load(const char *filename __maybe_unused) +{ + pr_debug("ERROR: eBPF object loading is disabled during compiling.\n"); + return -1; +} + +static inline void bpf__clear(void) { } + +static inline int +__bpf_strerror(char *buf, size_t size) +{ + if (!size) + return 0; + strncpy(buf, + "ERROR: eBPF object loading is disabled during compiling.\n", + size); + buf[size - 1] = '\0'; + return 0; +} + +static inline int +bpf__strerror_prepare_load(const char *filename __maybe_unused, + int err __maybe_unused, + char *buf, size_t size) +{ + return __bpf_strerror(buf, size); +} +#endif +#endif