From patchwork Sat Aug 29 04:21:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52822 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 68FAC20503 for ; Sat, 29 Aug 2015 04:24:23 +0000 (UTC) Received: by labd1 with SMTP id d1sf23972771lab.0 for ; Fri, 28 Aug 2015 21:24:22 -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=e26Adc0HrgACSUbvfnHQKVSJWGI3QOLk1KpXg/8LpYw=; b=Te9k2O2asIjZqIlj48XjC+mzyjdwKMbJlxme5CgEv6HGHPPVb2kDxPNBDaEHiwrjf8 O48NnZh9tvKb6aI8HeGO0rtzsE0H4KmYNPl/FBXhFhz9B1XDWkNGD0kG3WTIK+4je7qq qivrErbmVo8oUOz89Xagu8F4OGYA8HWE/CBSIt1TLWQGd9CWRY4emP82i6s/PaUI9Kk9 qgI8Qp5YPWD8YN+eqFw3D4O2zZzoaEjoSrbymu3dy/5taeMqv+kAJcCOo3yMRWQN26uY /pt+xZWJgXm/1Y5MhORLF1LVvoBwMLlGVUnc7sbw+UycQtcQ6G59jQM9EXbvnKOyqrLn 1r0A== X-Gm-Message-State: ALoCoQkQmnVy4tI62ybIFL5S+I5opc0eXqAj35/CTw5fT1VNicinsa/NWFRxC+MLtgb8rMG6O74U X-Received: by 10.112.170.67 with SMTP id ak3mr3575630lbc.6.1440822262408; Fri, 28 Aug 2015 21:24:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.74 with SMTP id k10ls280947laf.30.gmail; Fri, 28 Aug 2015 21:24:22 -0700 (PDT) X-Received: by 10.112.150.3 with SMTP id ue3mr2875725lbb.51.1440822262242; Fri, 28 Aug 2015 21:24:22 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id jf5si7657985lac.107.2015.08.28.21.24.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:24:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by laba3 with SMTP id a3so43295515lab.1 for ; Fri, 28 Aug 2015 21:24:21 -0700 (PDT) X-Received: by 10.152.37.104 with SMTP id x8mr6051217laj.29.1440822261714; Fri, 28 Aug 2015 21:24:21 -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 us2csp267573lbb; Fri, 28 Aug 2015 21:24:20 -0700 (PDT) X-Received: by 10.66.159.197 with SMTP id xe5mr21362867pab.32.1440822260527; Fri, 28 Aug 2015 21:24:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ue3si13334131pab.213.2015.08.28.21.24.19; Fri, 28 Aug 2015 21:24:20 -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 S1752633AbbH2EYA (ORCPT + 28 others); Sat, 29 Aug 2015 00:24:00 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:6348 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbbH2EX4 (ORCPT ); Sat, 29 Aug 2015 00:23:56 -0400 Received: from 172.24.1.50 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CRK01369; Sat, 29 Aug 2015 12:23:09 +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:59 +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 08/31] perf record, bpf: Parse and probe eBPF programs probe points Date: Sat, 29 Aug 2015 04:21:42 +0000 Message-ID: <1440822125-52691-9-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.215.50 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 introduces bpf__{un,}probe() functions to enable callers to create kprobe points based on section names of BPF programs. It parses the section names of each eBPF program and creates corresponding 'struct perf_probe_event' structures. The parse_perf_probe_command() function is used to do the main parsing work. Parsing result is stored into an array to satisify add_perf_probe_events(). It accepts an array of 'struct perf_probe_event' and do all the work in one call. Define PERF_BPF_PROBE_GROUP as "perf_bpf_probe", which will be used as the group name of all eBPF probing points. probe_conf.max_probes is set to MAX_PROBES to support glob matching. Before ending of bpf__probe(), data in each 'struct perf_probe_event' is cleaned. Things will be changed by following patches because they need 'struct probe_trace_event' in them, 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 Link: http://lkml.kernel.org/n/1436445342-1402-21-git-send-email-wangnan0@huawei.com Link: http://lkml.kernel.org/n/1436445342-1402-23-git-send-email-wangnan0@huawei.com [Merged by two patches] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 19 ++++++- tools/perf/util/bpf-loader.c | 133 +++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 13 +++++ 3 files changed, 164 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 31934b1..8833186 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1140,7 +1140,23 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) if (err) goto out_bpf_clear; - err = -ENOMEM; + /* + * bpf__probe must be called before symbol__init() because we + * need init_symbol_maps. If called after symbol__init, + * symbol_conf.sort_by_name won't take effect. + * + * bpf__unprobe() is safe even if bpf__probe() failed, and it + * also calls symbol__init. Therefore, goto out_symbol_exit + * is safe when probe failed. + */ + err = bpf__probe(); + if (err) { + bpf__strerror_probe(err, errbuf, sizeof(errbuf)); + + pr_err("Probing at events in BPF object failed.\n"); + pr_err("\t%s\n", errbuf); + goto out_symbol_exit; + } symbol__init(NULL); @@ -1201,6 +1217,7 @@ out_symbol_exit: perf_evlist__delete(rec->evlist); symbol__exit(); auxtrace_record__free(rec->itr); + bpf__unprobe(); out_bpf_clear: bpf__clear(); return err; diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 88531ea..435f52e 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -9,6 +9,8 @@ #include "perf.h" #include "debug.h" #include "bpf-loader.h" +#include "probe-event.h" +#include "probe-finder.h" #define DEFINE_PRINT_FN(name, level) \ static int libbpf_##name(const char *fmt, ...) \ @@ -28,6 +30,58 @@ DEFINE_PRINT_FN(debug, 1) static bool libbpf_initialized; +static int +config_bpf_program(struct bpf_program *prog, struct perf_probe_event *pev) +{ + const char *config_str; + int err; + + config_str = bpf_program__title(prog, false); + if (!config_str) { + pr_debug("bpf: unable to get title for program\n"); + return -EINVAL; + } + + pr_debug("bpf: config program '%s'\n", config_str); + err = parse_perf_probe_command(config_str, pev); + if (err < 0) { + pr_debug("bpf: '%s' is not a valid config string\n", + config_str); + /* parse failed, don't need clear pev. */ + return -EINVAL; + } + + if (pev->group && strcmp(pev->group, PERF_BPF_PROBE_GROUP)) { + pr_debug("bpf: '%s': group for event is set and not '%s'.\n", + config_str, PERF_BPF_PROBE_GROUP); + err = -EINVAL; + goto errout; + } else if (!pev->group) + pev->group = strdup(PERF_BPF_PROBE_GROUP); + + if (!pev->group) { + pr_debug("bpf: strdup failed\n"); + err = -ENOMEM; + goto errout; + } + + if (!pev->event) { + pr_debug("bpf: '%s': event name is missing\n", + config_str); + err = -EINVAL; + goto errout; + } + + pr_debug("bpf: config '%s' is ok\n", config_str); + + return 0; + +errout: + if (pev) + clear_perf_probe_event(pev); + return err; +} + int bpf__prepare_load(const char *filename) { struct bpf_object *obj; @@ -59,6 +113,74 @@ void bpf__clear(void) bpf_object__close(obj); } +static bool is_probed; + +int bpf__unprobe(void) +{ + struct strfilter *delfilter; + int ret; + + if (!is_probed) + return 0; + + delfilter = strfilter__new(PERF_BPF_PROBE_GROUP ":*", NULL); + if (!delfilter) { + pr_debug("Failed to create delfilter when unprobing\n"); + return -ENOMEM; + } + + ret = del_perf_probe_events(delfilter); + strfilter__delete(delfilter); + if (ret < 0 && is_probed) + pr_debug("Error: failed to delete events: %s\n", + strerror(-ret)); + else + is_probed = false; + return ret < 0 ? ret : 0; +} + +int bpf__probe(void) +{ + int err, nr_events = 0; + struct bpf_object *obj, *tmp; + struct bpf_program *prog; + struct perf_probe_event *pevs; + + pevs = calloc(MAX_PROBES, sizeof(pevs[0])); + if (!pevs) + return -ENOMEM; + + bpf_object__for_each_safe(obj, tmp) { + bpf_object__for_each_program(prog, obj) { + err = config_bpf_program(prog, &pevs[nr_events++]); + if (err < 0) + goto out; + + if (nr_events >= MAX_PROBES) { + pr_debug("Too many (more than %d) events\n", + MAX_PROBES); + err = -ERANGE; + goto out; + }; + } + } + + probe_conf.max_probes = MAX_PROBES; + /* Let add_perf_probe_events generates probe_trace_event (tevs) */ + err = add_perf_probe_events(pevs, nr_events, false); + + /* add_perf_probe_events return negative when fail */ + if (err < 0) { + pr_debug("bpf probe: failed to probe events\n"); + } else + is_probed = true; +out: + while (nr_events > 0) + clear_perf_probe_event(&pevs[--nr_events]); + free(pevs); + return err < 0 ? err : 0; +} + #define bpf__strerror_head(err, buf, size) \ char sbuf[STRERR_BUFSIZE], *emsg;\ if (!size)\ @@ -90,3 +212,14 @@ int bpf__strerror_prepare_load(const char *filename, int err, bpf__strerror_end(buf, size); return 0; } + +int bpf__strerror_probe(int err, char *buf, size_t size) +{ + bpf__strerror_head(err, buf, size); + bpf__strerror_entry(ERANGE, "Too many (more than %d) events", + MAX_PROBES); + bpf__strerror_entry(ENOENT, "Selected kprobe point doesn't exist."); + bpf__strerror_entry(EEXIST, "Selected kprobe point already exist, try perf probe -d '*'."); + bpf__strerror_end(buf, size); + return 0; +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 12be630..6b09a85 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -9,10 +9,15 @@ #include #include "debug.h" +#define PERF_BPF_PROBE_GROUP "perf_bpf_probe" + #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); +int bpf__probe(void); +int bpf__unprobe(void); +int bpf__strerror_probe(int err, char *buf, size_t size); void bpf__clear(void); #else @@ -22,6 +27,8 @@ static inline int bpf__prepare_load(const char *filename __maybe_unused) return -1; } +static inline int bpf__probe(void) { return 0; } +static inline int bpf__unprobe(void) { return 0; } static inline void bpf__clear(void) { } static inline int @@ -43,5 +50,11 @@ bpf__strerror_prepare_load(const char *filename __maybe_unused, { return __bpf_strerror(buf, size); } + +static inline int bpf__strerror_probe(int err __maybe_unused, + char *buf, size_t size) +{ + return __bpf_strerror(buf, size); +} #endif #endif