From patchwork Sat Oct 17 10:48:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 55157 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id E2FFC22FFA for ; Sat, 17 Oct 2015 10:50:35 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf31495618lbc.1 for ; Sat, 17 Oct 2015 03:50:34 -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=mqbKIZsJBx8tJDue/O6Zllv1nXfLERjb8d30QmrTg2o=; b=JakfR5n0sfzVNdBumXVxmVuGBPZ4mkuYsThoYFvG4AIYCvSjEyTcRIBOt7ZLkwQGQG 0HxNDKSYUtFjbuWxMjg5XWD54Q787S7NWyyk8ohpL5JHI/Q31+1VyPlgKjM4qmFXDC7a YUL83JnVlyCRjev/WYWBngkMf3A09Zh9HV0+eEFv/cMONVmthpf71mPxLbwWFk6OTYVq Hmkwy82VolIDpY/vh3l1zdwZ5Mqur7dmmib2ikNlw6IecUgq5VJf6H+dN+NIEgHFZEeu 96RFEyoDbt4+rXmww+9OaZ70Ehovnz/OLASp5Ajyze8F9oX6Twa6U1WrK7IFE8bmgS3U Z5dA== X-Gm-Message-State: ALoCoQkWEPJHQCcti13USTDSN5aouqbPncd4d1P5fJMBLFKQvSxpQTPe6x6DoRjRLM5DKkFR/bMw X-Received: by 10.112.14.4 with SMTP id l4mr2863426lbc.20.1445079034866; Sat, 17 Oct 2015 03:50:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.21.42 with SMTP id l42ls365510lfi.96.gmail; Sat, 17 Oct 2015 03:50:34 -0700 (PDT) X-Received: by 10.112.146.231 with SMTP id tf7mr10439778lbb.103.1445079034477; Sat, 17 Oct 2015 03:50:34 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id h10si15823919lfh.15.2015.10.17.03.50.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2015 03:50:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbwb3 with SMTP id wb3so53745141lbb.1 for ; Sat, 17 Oct 2015 03:50:34 -0700 (PDT) X-Received: by 10.112.146.104 with SMTP id tb8mr10491148lbb.35.1445079034314; Sat, 17 Oct 2015 03:50:34 -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 w3csp436636lbq; Sat, 17 Oct 2015 03:50:33 -0700 (PDT) X-Received: by 10.66.219.74 with SMTP id pm10mr22103766pac.93.1445079033172; Sat, 17 Oct 2015 03:50:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jb1si36074545pbb.255.2015.10.17.03.50.32; Sat, 17 Oct 2015 03:50:33 -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 S1752852AbbJQKuB (ORCPT + 30 others); Sat, 17 Oct 2015 06:50:01 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:7842 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbbJQKtU (ORCPT ); Sat, 17 Oct 2015 06:49:20 -0400 Received: from 172.24.1.50 (EHLO szxeml428-hub.china.huawei.com) ([172.24.1.50]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CWX99305; Sat, 17 Oct 2015 18:48:54 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.235.1; Sat, 17 Oct 2015 18:48:44 +0800 From: Wang Nan To: , , CC: , , , , , , , , , , , , Wang Nan , Arnaldo Carvalho de Melo Subject: [RFC PATCH 4/7] perf tools: Enable BPF object configure syntax Date: Sat, 17 Oct 2015 10:48:27 +0000 Message-ID: <1445078910-73699-5-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1445078910-73699-1-git-send-email-wangnan0@huawei.com> References: <1445078910-73699-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.217.179 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 the final step for BPF map configuration. A new syntax is appended into parser so user can config BPF objects through '/' '/' enclosed config terms. After this patch, BPF programs for perf are able to get value through perf cmdline like: # perf record -e bpf_file.c/maps.mymap.value=123/ ... 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-2mjd96mowgzslkj8jrwbnwg7@git.kernel.org --- tools/perf/util/parse-events.c | 54 +++++++++++++++++++++++++++++++++++++++--- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.y | 21 ++++++++++++---- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 06ba5a6..9f081a1 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -624,17 +624,62 @@ errout: return err; } +static int +parse_events_config_bpf(struct parse_events_evlist *data, + struct bpf_object *obj, + struct list_head *head_config) +{ + struct parse_events_term *term; + + if (!head_config || list_empty(head_config)) + return 0; + + list_for_each_entry(term, head_config, list) { + char errbuf[BUFSIZ]; + int err; + + if (term->type_term != PARSE_EVENTS__TERM_TYPE_USER) { + snprintf(errbuf, sizeof(errbuf), + "Invalid config term for BPF object"); + errbuf[BUFSIZ - 1] = '\0'; + + data->error->idx = term->err_term; + data->error->str = strdup(errbuf); + return -EINVAL; + } + + err = bpf__config_obj(obj, term, data->evlist); + if (err) { + bpf__strerror_config_obj(obj, term, data->evlist, + err, errbuf, sizeof(errbuf)); + data->error->help = strdup( +"Hint:\tValid config term:\n" +" \tmaps..value\n" +" \t(add -v to see detail)"); + data->error->str = strdup(errbuf); + if (err == -EINVAL) + data->error->idx = term->err_val; + else + data->error->idx = term->err_term; + return err; + } + } + return 0; + +} + int parse_events_load_bpf(struct parse_events_evlist *data, struct list_head *list, char *bpf_file_name, - bool source) + bool source, + struct list_head *head_config) { struct bpf_object *obj; + int err; obj = bpf__prepare_load(bpf_file_name, source); if (IS_ERR(obj) || !obj) { char errbuf[BUFSIZ]; - int err; err = obj ? PTR_ERR(obj) : -EINVAL; @@ -651,7 +696,10 @@ int parse_events_load_bpf(struct parse_events_evlist *data, return err; } - return parse_events_load_bpf_obj(data, list, obj); + err = parse_events_load_bpf_obj(data, list, obj); + if (err) + return err; + return parse_events_config_bpf(data, obj, head_config); } static int diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index b525353..d4aa88e 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -125,7 +125,8 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, int parse_events_load_bpf(struct parse_events_evlist *data, struct list_head *list, char *bpf_file_name, - bool source); + bool source, + struct list_head *head_config); /* Provide this function for perf test */ struct bpf_object; int parse_events_load_bpf_obj(struct parse_events_evlist *data, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 90e382f..255387a 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -64,6 +64,7 @@ static inc_group_count(struct list_head *list, %type PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT %type value_sym %type event_config +%type event_bpf_config %type event_term %type event_pmu %type event_legacy_symbol @@ -468,27 +469,39 @@ PE_RAW } event_bpf_file: -PE_BPF_OBJECT +PE_BPF_OBJECT event_bpf_config { struct parse_events_evlist *data = _data; struct parse_events_error *error = data->error; struct list_head *list; ALLOC_LIST(list); - ABORT_ON(parse_events_load_bpf(data, list, $1, false)); + ABORT_ON(parse_events_load_bpf(data, list, $1, false, $2)); + parse_events__free_terms($2); $$ = list; } | -PE_BPF_SOURCE +PE_BPF_SOURCE event_bpf_config { struct parse_events_evlist *data = _data; struct list_head *list; ALLOC_LIST(list); - ABORT_ON(parse_events_load_bpf(data, list, $1, true)); + ABORT_ON(parse_events_load_bpf(data, list, $1, true, $2)); + parse_events__free_terms($2); $$ = list; } +event_bpf_config: +'/' event_config '/' +{ + $$ = $2; +} +| +{ + $$ = NULL; +} + start_terms: event_config { struct parse_events_terms *data = _data;