From patchwork Wed Oct 14 12:41: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: 54922 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 7AEB323012 for ; Wed, 14 Oct 2015 12:43:33 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf25973357wic.3 for ; Wed, 14 Oct 2015 05:43:32 -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=NUAhmyzTTETED7TUHWurXItxA/qq/wSNmFELxNYT4B8=; b=cZ+ppoyE1iBXXKzc9gFSPP4EkwKRIqKEiC9f1xP7FIH79l94XtG2BlxMn/KVoKV0yA iqfdl8pZhfqBln43BtpxwY6Rddhst4DAvq4cBtCN3xu97PL+S5IIbFs8QG+OFNStPM0r s/Yx2d5dt5RiqEEmFburWUiiuw83e9zGW0b3F09Dmnbf2osPeOfM0dXgxBxjT5/hSUOX RSXuUHmdXBL2/TfKAYbQtEeqZI7TMOZONP2aUZUSiZ6o6F0CVRu1NApRV2HcNuDuVkux VPsFTQZDkeO/o89ZMGDPau2W/mA645T2QLtF9Jp22xaF3AXO86d7o23r9CXId5y2FMHC /tRQ== X-Gm-Message-State: ALoCoQkg1mxAWQlSj8o2/ZQHvQ4C0R37bZaPLL3a0gCkSkMtXeEOFi6m6PGvTL8qb4LS7MP6SZRX X-Received: by 10.112.150.229 with SMTP id ul5mr746888lbb.2.1444826612590; Wed, 14 Oct 2015 05:43:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.150.209 with SMTP id y200ls31711lfd.17.gmail; Wed, 14 Oct 2015 05:43:32 -0700 (PDT) X-Received: by 10.112.162.162 with SMTP id yb2mr1514318lbb.94.1444826612413; Wed, 14 Oct 2015 05:43:32 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id c20si5451265lfb.26.2015.10.14.05.43.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2015 05:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbwr8 with SMTP id r8so45018622lbw.2 for ; Wed, 14 Oct 2015 05:43:32 -0700 (PDT) X-Received: by 10.112.132.7 with SMTP id oq7mr1540907lbb.32.1444826611913; Wed, 14 Oct 2015 05:43:31 -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 w3csp2710044lbq; Wed, 14 Oct 2015 05:43:30 -0700 (PDT) X-Received: by 10.68.111.129 with SMTP id ii1mr3592324pbb.1.1444826610820; Wed, 14 Oct 2015 05:43:30 -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.30; Wed, 14 Oct 2015 05:43:30 -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 S932128AbbJNMnW (ORCPT + 30 others); Wed, 14 Oct 2015 08:43:22 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:50493 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753469AbbJNMnJ (ORCPT ); Wed, 14 Oct 2015 08:43:09 -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 CWT05981; Wed, 14 Oct 2015 20:42:48 +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:40 +0800 From: Wang Nan To: , , CC: , , , , , , , , , , , , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 31/31] perf tools: Enable BPF object configure syntax Date: Wed, 14 Oct 2015 12:41:42 +0000 Message-ID: <1444826502-49291-32-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.217.176 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 finally able to utilize bpf_perf_event_read() introduced in commit 35578d7984003097af2b1e3 (bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter) by following way: ===== BPF program bpf_program.c ===== struct bpf_map_def SEC("maps") pmu_map = { .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, .key_size = sizeof(int), .value_size = sizeof(u32), .max_entries = __NR_CPUS__, }; SEC("func_write=sys_write") int func_write(void *ctx) { unsigned long long val; char fmt[] = "sys_write: pmu=%llu\n"; val = bpf_perf_event_read(&pmu_map, bpf_get_smp_processor_id()); bpf_trace_printk(fmt, sizeof(fmt), val); return 0; } SEC("func_write_return=sys_write%return") int func_write_return(void *ctx) { unsigned long long val = 0; char fmt[] = "sys_write_return: pmu=%llu\n"; val = bpf_perf_event_read(&pmu_map, bpf_get_smp_processor_id()); bpf_trace_printk(fmt, sizeof(fmt), val); return 0; } ===== cmdline ===== # echo "" > /sys/kernel/debug/tracing/trace # perf record -e evt=cycles/period=0x7fffffffffffffff/ \ -e bpf_program.c/maps.pmu_map.event=evt/ -a ls # cat /sys/kernel/debug/tracing/trace | grep ls ls-3363 [003] d... 75475.056190: : sys_write: pmu=3961415 ls-3363 [003] dN.. 75475.056212: : sys_write_return: pmu=4051390 ls-3363 [003] d... 75475.056216: : sys_write: pmu=4065447 ls-3363 [003] dN.. 75475.056227: : sys_write_return: pmu=4109760 ls-3363 [003] d... 75475.056230: : sys_write: pmu=4120776 ls-3363 [003] dN.. 75475.056245: : sys_write_return: pmu=4178441 ... # perf report --stdio Error: The perf.data file has no samples! Where, setting period of cycles Set a very large value to period of cycles event because we want to use this event as a counter only, don't need sampling. 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 | 71 ++++++++++++++++++++++++++++++++++++++++-- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.y | 19 ++++++++--- 3 files changed, 85 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 06ba5a6..f8b2bb8 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -624,17 +624,79 @@ 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) { + struct bpf_config_val val; + 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; + } + + switch (term->type_val) { + case PARSE_EVENTS__TERM_TYPE_NUM: + val.type = BPF_CONFIG_VAL_NUM; + val.num = (unsigned long long)term->val.num; + break; + case PARSE_EVENTS__TERM_TYPE_STR: + val.type = BPF_CONFIG_VAL_STRING; + val.string = term->val.str; + break; + default: + data->error->idx = term->err_val; + data->error->str = strdup("Invalid config value"); + return -EINVAL; + } + + err = bpf__config_obj(obj, term->config, &val, data->evlist); + if (err) { + bpf__strerror_config_obj(obj, term->config, &val, + data->evlist, err, errbuf, + sizeof(errbuf)); + data->error->help = strdup( +"Hint:\tValid config term:\n" +" \tmaps..event\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 +713,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..545bce5 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,37 @@ 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)); $$ = 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)); $$ = list; } +event_bpf_config: +'/' event_config '/' +{ + $$ = $2; +} +| +{ + $$ = NULL; +} + start_terms: event_config { struct parse_events_terms *data = _data;