From patchwork Sat Aug 29 04:21:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52846 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 6404720503 for ; Sat, 29 Aug 2015 04:30:49 +0000 (UTC) Received: by labth1 with SMTP id th1sf24052616lab.2 for ; Fri, 28 Aug 2015 21:30:48 -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=PWLLL1j5FZIb/PuG9nKHPLGlsn2D7A6a654kW/ecouA0hFGAf3Ez+SJSzuNV1OO5GM /MuMjKn1/7wxBwYPgS6SQ7oN7cH4r12FEbSMue8lDNDVD0RpK8GkwhB/MK2zQIVGEcZG vSkEN0t1Qc1MJGkaohHaFbDuRHDFLu0e33yyDgmorejdd5i4XLjEY6Pu42oWFgTmaKtq RS8qf7Oe3YP6mKfb9b4Q71hbssWm+9zjAHJ79ab2uAE5su2sZB8HB4xdARiGtAHLq6yT CqDnCsJ/qruQSuWwL/F8Tuw/2+bTKJZ+pNnv9nkPtIOmRR/t/DQEjRgce/bwD0xXqL0R QWyw== X-Gm-Message-State: ALoCoQkuOgjisyJsHtHKieoFqH30TczMqByJnjyNIMNeYnhCErllf6uZqZpI5Kn2k3UdrflYnmTr X-Received: by 10.194.80.69 with SMTP id p5mr3638342wjx.2.1440822648379; Fri, 28 Aug 2015 21:30:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.33 with SMTP id ld1ls289754lac.6.gmail; Fri, 28 Aug 2015 21:30:48 -0700 (PDT) X-Received: by 10.112.201.36 with SMTP id jx4mr6320813lbc.9.1440822647956; Fri, 28 Aug 2015 21:30:47 -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 k8si7678362lbd.51.2015.08.28.21.30.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:30:47 -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 lbvd4 with SMTP id d4so3453753lbv.3 for ; Fri, 28 Aug 2015 21:30:47 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr6262346lbb.56.1440822647756; Fri, 28 Aug 2015 21:30:47 -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.151.194 with SMTP id us2csp269526lbb; Fri, 28 Aug 2015 21:30:46 -0700 (PDT) X-Received: by 10.69.11.5 with SMTP id ee5mr20492073pbd.89.1440822646631; Fri, 28 Aug 2015 21:30:46 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ma1si13336206pdb.234.2015.08.28.21.30.45; Fri, 28 Aug 2015 21:30:46 -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 S1753433AbbH2Eao (ORCPT + 28 others); Sat, 29 Aug 2015 00:30:44 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:3663 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752306AbbH2EXj (ORCPT ); Sat, 29 Aug 2015 00:23:39 -0400 Received: from 172.24.1.50 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.50]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BLW04289; Sat, 29 Aug 2015 12:23:04 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Sat, 29 Aug 2015 12:22:55 +0800 From: Wang Nan To: , , CC: , , , Wang Nan , Brendan Gregg , Daniel Borkmann , David Ahern , "He Kuang" , Jiri Olsa , Kaixu Xia , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra Subject: [PATCH 05/31] perf ebpf: Add the libbpf glue Date: Sat, 29 Aug 2015 04:21:39 +0000 Message-ID: <1440822125-52691-6-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> References: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.55E133A8.0074, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b4d18d96d8cce7b2812fb3c207752e5a 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