From patchwork Sat Aug 29 04:21:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52835 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id DB59B20503 for ; Sat, 29 Aug 2015 04:27:18 +0000 (UTC) Received: by lbck9 with SMTP id k9sf22544334lbc.0 for ; Fri, 28 Aug 2015 21:27:17 -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=3r3uZpCIDmqPugmR5O9HrvtuBwI7jiyyz3FFWsqGUdY=; b=U8rcSFjheZhN9fOSNrGNpdfZFXl1oD8KP4HX5rzDjK3po9c2dZfmGAcKoaGTkyUo/V QS9FY430JefyUsM/fRxsX3xZ0qAXeVZKdpuc6suXl8uaNs7YdxmKSpvFbxiEFY3Tz5tY fUS/xXmZrZzV+JR9YJRJ02vhEn4boroFB8RQsS/UKB3z+jqFCaXzpfVV013DYERSbxcY WYMpH5592lTTRD9p7Oj5Q7qQH8JIBLKkg+LrQY0xY5es0S3GhAnja07NoTJOe7/mUbvh oczIXthicQFNPsFK9/YN4sNGGVSZQKnEDXw9xdwzhbqxgnvfo8TQZ4l3vhdAqL428dnV efWw== X-Gm-Message-State: ALoCoQnlSwZZoMfhz8+x6DFiLyhZSzyipHHA4dKCVnybr8kpULs1gVFqoa15alV1dD7jF5PKe7tn X-Received: by 10.180.12.205 with SMTP id a13mr2016443wic.4.1440822437863; Fri, 28 Aug 2015 21:27:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.100 with SMTP id s4ls282589lag.83.gmail; Fri, 28 Aug 2015 21:27:17 -0700 (PDT) X-Received: by 10.112.156.69 with SMTP id wc5mr4877216lbb.53.1440822437679; Fri, 28 Aug 2015 21:27:17 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id e1si7665877lbs.96.2015.08.28.21.27.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:27:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbbtg9 with SMTP id tg9so39584261lbb.1 for ; Fri, 28 Aug 2015 21:27:17 -0700 (PDT) X-Received: by 10.152.5.228 with SMTP id v4mr6485276lav.36.1440822437372; Fri, 28 Aug 2015 21:27:17 -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 us2csp268454lbb; Fri, 28 Aug 2015 21:27:16 -0700 (PDT) X-Received: by 10.68.104.227 with SMTP id gh3mr20775114pbb.108.1440822436268; Fri, 28 Aug 2015 21:27:16 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pd5si2067119pbb.131.2015.08.28.21.27.15; Fri, 28 Aug 2015 21:27:16 -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 S1753234AbbH2E1M (ORCPT + 28 others); Sat, 29 Aug 2015 00:27:12 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:40544 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbbH2E1J (ORCPT ); Sat, 29 Aug 2015 00:27:09 -0400 Received: from 172.24.1.47 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.47]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CTY94462; Sat, 29 Aug 2015 12:23:16 +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:23:02 +0800 From: Wang Nan To: , , CC: , , , Wang Nan , Brendan Gregg , Daniel Borkmann , David Ahern , "He Kuang" , Jiri Olsa , Kaixu Xia , Masami Hiramatsu , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 10/31] perf record: Load all eBPF object into kernel Date: Sat, 29 Aug 2015 04:21:44 +0000 Message-ID: <1440822125-52691-11-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 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.180 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: , This patch utilizes bpf_object__load() provided by libbpf to load all objects into kernel. Signed-off-by: Wang Nan Cc: 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: Paul Mackerras Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Cc: Arnaldo Carvalho de Melo Link: http://lkml.kernel.org/n/1436445342-1402-24-git-send-email-wangnan0@huawei.com --- tools/perf/builtin-record.c | 15 +++++++++++++++ tools/perf/util/bpf-loader.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 10 ++++++++++ 3 files changed, 53 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 8833186..c335ac5 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1158,6 +1158,21 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } + /* + * bpf__probe() also calls symbol__init() if there are probe + * events in bpf objects, so calling symbol_exit when failure + * is safe. If there is no probe event, bpf__load() always + * success. + */ + err = bpf__load(); + if (err) { + pr_err("Loading BPF programs failed:\n"); + + bpf__strerror_load(err, errbuf, sizeof(errbuf)); + pr_err("\t%s\n", errbuf); + goto out_symbol_exit; + } + symbol__init(NULL); if (symbol_conf.kptr_restrict) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index ae23f6f..d63a594 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -267,6 +267,25 @@ out: return err < 0 ? err : 0; } +int bpf__load(void) +{ + struct bpf_object *obj, *tmp; + int err = 0; + + bpf_object__for_each_safe(obj, tmp) { + err = bpf_object__load(obj); + if (err) { + pr_debug("bpf: load objects failed\n"); + goto errout; + } + } + return 0; +errout: + bpf_object__for_each_safe(obj, tmp) + bpf_object__unload(obj); + return err; +} + #define bpf__strerror_head(err, buf, size) \ char sbuf[STRERR_BUFSIZE], *emsg;\ if (!size)\ @@ -309,3 +328,12 @@ int bpf__strerror_probe(int err, char *buf, size_t size) bpf__strerror_end(buf, size); return 0; } + +int bpf__strerror_load(int err, char *buf, size_t size) +{ + bpf__strerror_head(err, buf, size); + bpf__strerror_entry(EINVAL, "%s: add -v to see detail. Run a CONFIG_BPF_SYSCALL kernel?", + emsg) + bpf__strerror_end(buf, size); + return 0; +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 6b09a85..4d7552e 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -19,6 +19,9 @@ int bpf__probe(void); int bpf__unprobe(void); int bpf__strerror_probe(int err, char *buf, size_t size); +int bpf__load(void); +int bpf__strerror_load(int err, char *buf, size_t size); + void bpf__clear(void); #else static inline int bpf__prepare_load(const char *filename __maybe_unused) @@ -29,6 +32,7 @@ static inline int bpf__prepare_load(const char *filename __maybe_unused) static inline int bpf__probe(void) { return 0; } static inline int bpf__unprobe(void) { return 0; } +static inline int bpf__load(void) { return 0; } static inline void bpf__clear(void) { } static inline int @@ -56,5 +60,11 @@ static inline int bpf__strerror_probe(int err __maybe_unused, { return __bpf_strerror(buf, size); } + +static inline int bpf__strerror_load(int err __maybe_unused, + char *buf, size_t size) +{ + return __bpf_strerror(buf, size); +} #endif #endif