From patchwork Wed Oct 14 12:41:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 54924 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 65DC123012 for ; Wed, 14 Oct 2015 12:43:37 +0000 (UTC) Received: by wibzt1 with SMTP id zt1sf26751630wib.0 for ; Wed, 14 Oct 2015 05:43:36 -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=+4YN2RAQVXfFb4gqQrOwNtrafDWIs4EYz/b0zD/ayEU=; b=MpFE0tQCHijZ1aUQFzOsbjhGWQ70wEakze3zAEYBmwhGWtVH7I28YX/GPx9a2fSox1 PSiOeHjYZemzBd9yV/wlK6PJT3QN8+/KXboHx7+tHD5LZZk4yMZVGfPd0sYEuDcRl5YQ c0M3NMguXgY4gAgwWrUR942pvuw0ZOw4QFbCkPTgXyGPD8rj4RBuUHZZHW2qSl0vRtUG ztYOlOw8hbu95A1puUXf8H0KTrMDFDk7wcqMRJaGbL9YeuWuOJEv2vaVNSGFAkrucZtW UnKs6pOjP6P6CbLlC5ARQerLugfb3r0a/ZJe7wPUp53TV0b5Li++JQmlrhJDSg9XKAWo kTNQ== X-Gm-Message-State: ALoCoQmXkIQakWVtYSPS1L642gUDYpIApHWUkfUiRqDvFSpu0MKtQFfQUI2OFHngxeZy7H1Q5Um3 X-Received: by 10.112.16.229 with SMTP id j5mr727606lbd.6.1444826616702; Wed, 14 Oct 2015 05:43:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.161.20 with SMTP id k20ls30674lfe.88.gmail; Wed, 14 Oct 2015 05:43:36 -0700 (PDT) X-Received: by 10.25.157.131 with SMTP id g125mr976866lfe.75.1444826616434; Wed, 14 Oct 2015 05:43:36 -0700 (PDT) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id h75si5424427lfe.140.2015.10.14.05.43.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2015 05:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lffv3 with SMTP id v3so10666030lff.0 for ; Wed, 14 Oct 2015 05:43:36 -0700 (PDT) X-Received: by 10.25.28.81 with SMTP id c78mr977042lfc.29.1444826615795; Wed, 14 Oct 2015 05:43:35 -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.59.35 with SMTP id w3csp2710081lbq; Wed, 14 Oct 2015 05:43:34 -0700 (PDT) X-Received: by 10.66.100.164 with SMTP id ez4mr3535449pab.141.1444826611854; Wed, 14 Oct 2015 05:43:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ph4si13027707pbb.177.2015.10.14.05.43.31; Wed, 14 Oct 2015 05:43:31 -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 S932201AbbJNMn3 (ORCPT + 30 others); Wed, 14 Oct 2015 08:43:29 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:50480 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680AbbJNMnI (ORCPT ); Wed, 14 Oct 2015 08:43:08 -0400 Received: from 172.24.1.49 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CWT05978; Wed, 14 Oct 2015 20:42:47 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Wed, 14 Oct 2015 20:42:37 +0800 From: Wang Nan To: , , CC: , , , , , , , , , , , , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 28/31] perf tools: Add API to config maps in bpf object Date: Wed, 14 Oct 2015 12:41:39 +0000 Message-ID: <1444826502-49291-29-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1444826502-49291-1-git-send-email-wangnan0@huawei.com> References: <1444826502-49291-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.51 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: , bpf__config_obj() is introduced as a core API to config BPF object after loading. One configuration option of maps is introduced. After this patch BPF object can accept configuration like: maps.my_pmy.event=evt Where evt is a predefined event with alias "evt". Signed-off-by: Wang Nan Signed-off-by: He Kuang Cc: Arnaldo Carvalho de Melo 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/ebpf-36xcrahy9n0ayc05mu7aajpk@git.kernel.org --- tools/perf/util/bpf-loader.c | 147 +++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 39 ++++++++++++ 2 files changed, 186 insertions(+) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 73ff9a9..b92c2f7 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -10,6 +10,7 @@ #include #include "perf.h" #include "debug.h" +#include "util.h" #include "bpf-loader.h" #include "bpf-prologue.h" #include "llvm-utils.h" @@ -633,6 +634,139 @@ int bpf__foreach_tev(struct bpf_object *obj, return 0; } +struct bpf_map_priv { + struct perf_evsel *evsel; +}; + +static void +bpf_map_priv__clear(struct bpf_map *map __maybe_unused, + void *_priv) +{ + struct bpf_map_priv *priv = _priv; + + free(priv); +} + +static int +bpf__config_obj_map_event(struct bpf_map *map, const char *val, + struct perf_evlist *evlist) +{ + struct bpf_map_priv *priv; + struct perf_evsel *evsel; + struct bpf_map_def def; + const char *map_name; + int err; + + map_name = bpf_map__get_name(map); + + evsel = perf_evlist__find_evsel_by_alias(evlist, val); + if (!evsel) { + pr_debug("Event '%s' doesn't exist\n", val); + return -EINVAL; + } + + err = bpf_map__get_def(map, &def); + if (err) { + pr_debug("Unable to get map definition from '%s'\n", + map_name); + return -EINVAL; + } + + if (def.type != BPF_MAP_TYPE_PERF_EVENT_ARRAY) { + pr_debug("Map %s type is not BPF_MAP_TYPE_PERF_EVENT_ARRAY\n", + map_name); + return -EINVAL; + } + + priv = calloc(sizeof(*priv), 1); + if (!priv) { + pr_debug("No enough memory to alloc map private\n"); + return -ENOMEM; + } + + priv->evsel = evsel; + return bpf_map__set_private(map, priv, bpf_map_priv__clear); +} + +struct bpf_config_map_func { + const char *config_opt; + int (*config_func)(struct bpf_map *, const char *, + struct perf_evlist *); +}; + +struct bpf_config_map_func bpf_config_map_funcs[] = { + {"event", bpf__config_obj_map_event}, +}; + +static int +bpf__config_obj_map(struct bpf_object *obj, + const char *key, + const char *val, + struct perf_evlist *evlist) +{ + /* key is "maps.." */ + char *map_name = strdup(key + sizeof("maps.") - 1); + struct bpf_map *map; + int err = -ENOENT; + char *map_opt; + size_t i; + + if (!map_name) + return -ENOMEM; + + map_opt = strchr(map_name, '.'); + if (!map_opt) { + pr_debug("ERROR: Invalid map config: %s\n", map_name); + goto out; + } + + *map_opt++ = '\0'; + if (*map_opt == '\0') { + pr_debug("ERROR: Invalid map option: %s\n", key); + goto out; + } + + map = bpf_object__get_map_by_name(obj, map_name); + if (!map) { + pr_debug("ERROR: Map %s doesn't exist\n", map_name); + goto out; + } + + for (i = 0; i < ARRAY_SIZE(bpf_config_map_funcs); i++) { + struct bpf_config_map_func *func = &bpf_config_map_funcs[i]; + + if (strcmp(map_opt, func->config_opt) == 0) { + err = func->config_func(map, val, evlist); + goto out; + } + } + + pr_debug("ERROR: invalid config option '%s' for maps\n", + map_opt); + err = -ENOENT; +out: + free(map_name); + return err; +} + +int bpf__config_obj(struct bpf_object *obj, + const char *key, + struct bpf_config_val *val, + struct perf_evlist *evlist) +{ + if (!obj || !key || !val) + return -ENODEV; + + if (!prefixcmp(key, "maps.")) { + if (val->type != BPF_CONFIG_VAL_STRING) { + pr_debug("ERROR: incorrect value type\n"); + return -EINVAL; + } + return bpf__config_obj_map(obj, key, val->string, evlist); + } + return -ENODEV; +} + #define bpf__strerror_head(err, buf, size) \ char sbuf[STRERR_BUFSIZE], *emsg;\ if (!size)\ @@ -675,3 +809,16 @@ int bpf__strerror_load(struct bpf_object *obj __maybe_unused, bpf__strerror_end(buf, size); return 0; } + +int bpf__strerror_config_obj(struct bpf_object *obj __maybe_unused, + const char *key, struct bpf_config_val *val, + struct perf_evlist *evlist __maybe_unused, + int err, char *buf, size_t size) +{ + bpf__strerror_head(err, buf, size); + bpf__strerror_entry(ENODEV, "Invalid config option: '%s'", key) + bpf__strerror_entry(ENOENT, "Config target in '%s' is invalid", key) + bpf__strerror_entry(EINVAL, "Invalid config value %s", val) + bpf__strerror_end(buf, size); + return 0; +} diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index d8f1945..4c99b21 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -9,6 +9,7 @@ #include #include #include "probe-event.h" +#include "evlist.h" #include "debug.h" struct bpf_object; @@ -17,6 +18,17 @@ struct bpf_object; typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev, int fd, void *arg); +struct bpf_config_val { + enum { + BPF_CONFIG_VAL_STRING, + BPF_CONFIG_VAL_NUM, + } type; + union { + const char *string; + unsigned long long num; + }; +}; + #ifdef HAVE_LIBBPF_SUPPORT struct bpf_object *bpf__prepare_load(const char *filename, bool source); struct bpf_object *bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, @@ -34,6 +46,13 @@ int bpf__strerror_load(struct bpf_object *obj, int err, char *buf, size_t size); int bpf__foreach_tev(struct bpf_object *obj, bpf_prog_iter_callback_t func, void *arg); + +int bpf__config_obj(struct bpf_object *obj, const char *key, + struct bpf_config_val *val, struct perf_evlist *evlist); +int bpf__strerror_config_obj(struct bpf_object *obj, + const char *key, struct bpf_config_val *val, + struct perf_evlist *evlist, + int err, char *buf, size_t size); #else static inline struct bpf_object * bpf__prepare_load(const char *filename __maybe_unused, @@ -65,6 +84,15 @@ bpf__foreach_tev(struct bpf_object *obj __maybe_unused, } static inline int +bpf__config_obj(struct bpf_object *obj __maybe_unused, + const char *key __maybe_unused, + struct bpf_config_val *val __maybe_unused, + struct perf_evlist *evlist __maybe_unused) +{ + return 0; +} + +static inline int __bpf_strerror(char *buf, size_t size) { if (!size) @@ -90,5 +118,16 @@ static inline int bpf__strerror_load(struct bpf_object *obj __maybe_unused, { return __bpf_strerror(buf, size); } + +static inline int +bpf__strerror_config_obj(struct bpf_object *obj __maybe_unused, + const char *key __maybe_unused, + struct bpf_config_val *val __maybe_unused, + struct perf_evlist *evlist __maybe_unused, + int err __maybe_unused, + char *buf, size_t size) +{ + return __bpf_strerror(buf, size); +} #endif #endif