Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752573AbbH1HHS (ORCPT ); Fri, 28 Aug 2015 03:07:18 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:62585 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235AbbH1HHJ (ORCPT ); Fri, 28 Aug 2015 03:07:09 -0400 From: Wang Nan To: , CC: , , , , , , , , , , , , Wang Nan , "Paul Mackerras" Subject: [PATCH 10/32] perf record: Load all eBPF object into kernel Date: Fri, 28 Aug 2015 07:05:48 +0000 Message-ID: <1440745570-150857-11-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1440745570-150857-1-git-send-email-wangnan0@huawei.com> References: <1440745570-150857-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4106 Lines: 136 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 -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/