From patchwork Sat Aug 29 04:21:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52825 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 1367F20503 for ; Sat, 29 Aug 2015 04:24:29 +0000 (UTC) Received: by wieo17 with SMTP id o17sf12835109wie.2 for ; Fri, 28 Aug 2015 21:24:28 -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=pF0aIcpz3IEUmgVWS9hEwZ/a2OivLNQOH4ggSgCon+Q=; b=lYJVA2HIXXp+B5JJ1y91jaAJSIxBwotMrAQ75qqHLlwy18xK4zm5i1VyqSn3FIPPq+ WX3cwqSKC4SxW8lAgwwMASZFtjpjR06fQftboGhRZSfLYIyfqpHbVx7sRS6OFLYQEIjc mVv/MQ1DSI3Yph+ZJv7s4mr0pRg0pjEXY/UI4YQiTuFOGHvmDnusdWPDP2q6ACdMUPHD KcbScoBtjxMxHaBFDu6QKys57b3JgcZHnk8ygMmGqyqmEJMHQep1HTGKA5E2OyGx/cui FvGIyDOVlT/cfT3uZnD8XzLkfnGyjVyiLbGkDcnHZnhwQVHL3Z0dLmG6D3hLLQln/JUS 2QnA== X-Gm-Message-State: ALoCoQlVGgupvWxFmcf5VFIf9DifeyU8IlWWQOUs3apdCmUHFmheLfLY7VskYvTDwjJfGlKB6vtt X-Received: by 10.180.216.12 with SMTP id om12mr2008967wic.1.1440822268329; Fri, 28 Aug 2015 21:24:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.40 with SMTP id kz8ls284572lab.24.gmail; Fri, 28 Aug 2015 21:24:28 -0700 (PDT) X-Received: by 10.112.137.164 with SMTP id qj4mr6005357lbb.105.1440822268008; Fri, 28 Aug 2015 21:24:28 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id qn5si7652733lbb.138.2015.08.28.21.24.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:24:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by laboe4 with SMTP id oe4so17413402lab.0 for ; Fri, 28 Aug 2015 21:24:27 -0700 (PDT) X-Received: by 10.112.146.135 with SMTP id tc7mr6342212lbb.35.1440822267866; Fri, 28 Aug 2015 21:24:27 -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 us2csp267609lbb; Fri, 28 Aug 2015 21:24:26 -0700 (PDT) X-Received: by 10.66.250.226 with SMTP id zf2mr20769100pac.20.1440822266724; Fri, 28 Aug 2015 21:24:26 -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.24; Fri, 28 Aug 2015 21:24:26 -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 S1752775AbbH2EYM (ORCPT + 28 others); Sat, 29 Aug 2015 00:24:12 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:39830 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752667AbbH2EYG (ORCPT ); Sat, 29 Aug 2015 00:24:06 -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 CTY94467; 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:03 +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 11/31] perf tools: Add bpf_fd field to evsel and config it Date: Sat, 29 Aug 2015 04:21:45 +0000 Message-ID: <1440822125-52691-12-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.43 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 adds a bpf_fd field to 'struct evsel' then introduces method to config it. In bpf-loader, a bpf__foreach_tev() function is added, which calls the callback function for each 'struct probe_trace_event' events for each bpf program with their file descriptors. In evlist.c, perf_evlist__add_bpf() is introduced to add all bpf events into evlist. The event names are found from probe_trace_event structure. 'perf record' calls perf_evlist__add_bpf(). Since bpf-loader.c will not be built if libbpf is turned off, an empty bpf__foreach_tev() is defined in bpf-loader.h to avoid compiling error. This patch iterates over 'struct probe_trace_event' instead of 'struct probe_trace_event' during the loop for further patches, which will generate multiple instances form one BPF program and install then onto different 'struct probe_trace_event'. 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-25-git-send-email-wangnan0@huawei.com --- tools/perf/builtin-record.c | 6 ++++++ tools/perf/util/bpf-loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 13 +++++++++++++ tools/perf/util/evlist.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + 7 files changed, 104 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index c335ac5..5051d3b 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1173,6 +1173,12 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } + err = perf_evlist__add_bpf(rec->evlist); + if (err < 0) { + pr_err("Failed to add events from BPF object(s)\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 d63a594..126aa71 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -286,6 +286,47 @@ errout: return err; } +int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg) +{ + struct bpf_object *obj, *tmp; + struct bpf_program *prog; + int err; + + bpf_object__for_each_safe(obj, tmp) { + bpf_object__for_each_program(prog, obj) { + struct probe_trace_event *tev; + struct perf_probe_event *pev; + struct bpf_prog_priv *priv; + int i, fd; + + err = bpf_program__get_private(prog, + (void **)&priv); + if (err || !priv) { + pr_debug("bpf: failed to get private field\n"); + return -EINVAL; + } + + pev = &priv->pev; + for (i = 0; i < pev->ntevs; i++) { + tev = &pev->tevs[i]; + + fd = bpf_program__fd(prog); + if (fd < 0) { + pr_debug("bpf: failed to get file descriptor\n"); + return fd; + } + + err = func(tev, fd, arg); + if (err) { + pr_debug("bpf: call back failed, stop iterate\n"); + return err; + } + } + } + } + return 0; +} + #define bpf__strerror_head(err, buf, size) \ char sbuf[STRERR_BUFSIZE], *emsg;\ if (!size)\ diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 4d7552e..34656f8 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -7,10 +7,14 @@ #include #include +#include "probe-event.h" #include "debug.h" #define PERF_BPF_PROBE_GROUP "perf_bpf_probe" +typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev, + int fd, void *arg); + #ifdef HAVE_LIBBPF_SUPPORT int bpf__prepare_load(const char *filename); int bpf__strerror_prepare_load(const char *filename, int err, @@ -23,6 +27,8 @@ int bpf__load(void); int bpf__strerror_load(int err, char *buf, size_t size); void bpf__clear(void); + +int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg); #else static inline int bpf__prepare_load(const char *filename __maybe_unused) { @@ -36,6 +42,13 @@ static inline int bpf__load(void) { return 0; } static inline void bpf__clear(void) { } static inline int +bpf__foreach_tev(bpf_prog_iter_callback_t func __maybe_unused, + void *arg __maybe_unused) +{ + return 0; +} + +static inline int __bpf_strerror(char *buf, size_t size) { if (!size) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 8a4e64d..f79bbf8 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -14,6 +14,7 @@ #include "target.h" #include "evlist.h" #include "evsel.h" +#include "bpf-loader.h" #include "debug.h" #include @@ -196,6 +197,46 @@ error: return -ENOMEM; } +static int add_bpf_event(struct probe_trace_event *tev, int fd, + void *arg) +{ + struct perf_evlist *evlist = arg; + struct perf_evsel *pos; + struct list_head list; + int err, idx, entries; + + pr_debug("add bpf event %s:%s and attach bpf program %d\n", + tev->group, tev->event, fd); + INIT_LIST_HEAD(&list); + idx = evlist->nr_entries; + + pr_debug("adding %s:%s\n", tev->group, tev->event); + err = parse_events_add_tracepoint(&list, &idx, tev->group, + tev->event); + if (err) { + struct perf_evsel *evsel, *tmp; + + pr_err("Failed to add BPF event %s:%s\n", + tev->group, tev->event); + list_for_each_entry_safe(evsel, tmp, &list, node) { + list_del(&evsel->node); + perf_evsel__delete(evsel); + } + return -EINVAL; + } + + list_for_each_entry(pos, &list, node) + pos->bpf_fd = fd; + entries = idx - evlist->nr_entries; + perf_evlist__splice_list_tail(evlist, &list, entries); + return 0; +} + +int perf_evlist__add_bpf(struct perf_evlist *evlist) +{ + return bpf__foreach_tev(add_bpf_event, evlist); +} + static int perf_evlist__add_attrs(struct perf_evlist *evlist, struct perf_event_attr *attrs, size_t nr_attrs) { diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 7f15727..f7159c5 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -73,6 +73,7 @@ void perf_evlist__delete(struct perf_evlist *evlist); void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry); int perf_evlist__add_default(struct perf_evlist *evlist); +int perf_evlist__add_bpf(struct perf_evlist *evlist); int __perf_evlist__add_default_attrs(struct perf_evlist *evlist, struct perf_event_attr *attrs, size_t nr_attrs); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 01267f4..6fff961 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -207,6 +207,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->unit = ""; evsel->scale = 1.0; evsel->evlist = NULL; + evsel->bpf_fd = -1; INIT_LIST_HEAD(&evsel->node); INIT_LIST_HEAD(&evsel->config_terms); perf_evsel__object.init(evsel); diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 0b8e47d..699bb14 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -120,6 +120,7 @@ struct perf_evsel { bool cmdline_group_boundary; bool is_dummy; struct list_head config_terms; + int bpf_fd; }; union u64_swap {