From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752728AbbE0FV7 (ORCPT ); Wed, 27 May 2015 01:21:59 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:7183 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943AbbE0FVp (ORCPT ); Wed, 27 May 2015 01:21:45 -0400 From: Wang Nan To: , , , , , , , , , CC: , , Subject: [RFC PATCH v4 27/29] perf record: Load all eBPF object into kernel Date: Wed, 27 May 2015 05:20:02 +0000 Message-ID: <1432704004-171454-28-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1432704004-171454-1-git-send-email-wangnan0@huawei.com> References: <1432704004-171454-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.200] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch utilizes bpf_load_object() provided by libbpf to load all objects into kernel. Signed-off-by: Wang Nan --- tools/perf/builtin-record.c | 12 ++++++++++++ tools/perf/util/bpf-loader.c | 19 +++++++++++++++++++ tools/perf/util/bpf-loader.h | 1 + 3 files changed, 32 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 9297800..4b52399 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -970,6 +970,18 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) return err; } + /* + * bpf__probe() also calls symbol__init() if there are probe + * events in bpf objects, so calling symbol_exit when failuer + * is safe. If there is no probe event, bpf__load() always + * success. + */ + err = bpf__load(); + if (err) { + pr_err("Loading BPF programs failed\n"); + 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 f5d5f3e..f9a1ab9 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -224,3 +224,22 @@ int bpf__probe(void) return err < 0 ? err : 0; } + +int bpf__load(void) +{ + struct bpf_object *obj, *tmp; + int err = 0; + + bpf_object__for_each(obj, tmp) { + err = bpf_object__load(obj); + if (err) { + pr_err("bpf: load objects failed\n"); + goto errout; + } + } + return 0; +errout: + bpf_object__for_each(obj, tmp) + bpf_object__unload(obj); + return err; +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 1127880..fcc775d 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -10,6 +10,7 @@ int bpf__prepare_load(const char *filename); int bpf__probe(void); int bpf__unprobe(void); +int bpf__load(void); void bpf__clear(void); #endif -- 1.8.3.4