From patchwork Mon Apr 7 15:04:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 27902 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0E5D320C9F for ; Mon, 7 Apr 2014 15:05:50 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id j17sf28638016oag.6 for ; Mon, 07 Apr 2014 08:05:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=++Uk2v72PIUYCLfmgvaX3xZhcURCm6y3SVhNF75FFQw=; b=ONifiTpfceqssMIAJVQ+gh5ZvP+nwFH7E9lHsyd1iAO+ybA/lO3Sx6JotGtddpC1lb 2xuDNqig4XvcY9q27dTjMmelI7FykG+hzQ3Y1dpbKlqA+cFTu8u30nFEpw77d+ryIlj/ IN1rc7YrLQbZYIRiDtHEa/z7QiWzZM6IKodHwgNUSYxz9Qo92istwNHeBodUw/I62OOy NNnv3eB/Qa1WboAECgEACcBnszC3ulT/x3gniPx5bs8u5/dPlyjxLIqbl0viwrSeWofq DEEUiEzEkjk6mtuZYLKDNIuQcBAc1d1mCbVhkR9tCBJmieVhJ1kqkkNmUvxQgqy+QT/e 0JTA== X-Gm-Message-State: ALoCoQm2ratqUdwI+ghsYBjBSWxqF1y7fzIAWhsrfxQ6beSSqxZ8CxmE7inY58yiaoACKzpQNUl5 X-Received: by 10.42.123.66 with SMTP id q2mr13831883icr.16.1396883150562; Mon, 07 Apr 2014 08:05:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.110 with SMTP id o101ls1182858qgo.18.gmail; Mon, 07 Apr 2014 08:05:50 -0700 (PDT) X-Received: by 10.220.161.8 with SMTP id p8mr24640908vcx.4.1396883150399; Mon, 07 Apr 2014 08:05:50 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id o2si2170409vew.61.2014.04.07.08.05.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Apr 2014 08:05:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so3808508veb.1 for ; Mon, 07 Apr 2014 08:05:50 -0700 (PDT) X-Received: by 10.220.89.4 with SMTP id c4mr2273vcm.53.1396883150305; Mon, 07 Apr 2014 08:05:50 -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.220.12.8 with SMTP id v8csp169633vcv; Mon, 7 Apr 2014 08:05:49 -0700 (PDT) X-Received: by 10.68.196.202 with SMTP id io10mr3478067pbc.149.1396883149402; Mon, 07 Apr 2014 08:05:49 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nm5si8503490pbc.122.2014.04.07.08.05.48; Mon, 07 Apr 2014 08:05:48 -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 S1755522AbaDGPFh (ORCPT + 27 others); Mon, 7 Apr 2014 11:05:37 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:46840 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755440AbaDGPF2 (ORCPT ); Mon, 7 Apr 2014 11:05:28 -0400 Received: by mail-ee0-f48.google.com with SMTP id b57so710119eek.7 for ; Mon, 07 Apr 2014 08:05:27 -0700 (PDT) X-Received: by 10.14.251.204 with SMTP id b52mr3410782ees.36.1396883127160; Mon, 07 Apr 2014 08:05:27 -0700 (PDT) Received: from localhost.localdomain (201-179-62-37.mobileinternet.proximus.be. [37.62.179.201]) by mx.google.com with ESMTPSA id o4sm42287649eef.20.2014.04.07.08.05.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 07 Apr 2014 08:05:26 -0700 (PDT) From: Jean Pihet To: Borislav Petkov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , linux-kernel@vger.kernel.org, Robert Richter Cc: Robert Richter , Jean Pihet Subject: [PATCH 14/16] perf tools: Modify event parser to update event attribute by index Date: Mon, 7 Apr 2014 17:04:36 +0200 Message-Id: <1396883078-25320-15-git-send-email-jean.pihet@linaro.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1396883078-25320-1-git-send-email-jean.pihet@linaro.org> References: <1396883078-25320-1-git-send-email-jean.pihet@linaro.org> 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: jean.pihet@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=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: , From: Robert Richter In a later patch we want to introduce a syntax that allows updating attribute fields by an index pointing to a certain u64 entry of struct perf_event_attr. We need this to expose any event via sysfs that is available in the system where especially flag fields need to be set. Reworking the event parser to use an attribute index. This is done by introducing type PARSE_EVENTS__TERM_TYPE_ATTR for all numeric values to be added to the event attribute fields. We use an index to specify the corresponding u64 attr value. Signed-off-by: Robert Richter Signed-off-by: Robert Richter Signed-off-by: Jean Pihet --- tools/perf/tests/parse-events.c | 12 ++++++--- tools/perf/util/parse-events.c | 59 +++++++++++++++++++---------------------- tools/perf/util/parse-events.h | 12 ++++----- tools/perf/util/parse-events.l | 18 ++++++------- tools/perf/util/parse-events.y | 24 ++++++++++------- 5 files changed, 65 insertions(+), 60 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 8605ff5..c15660c 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -463,7 +463,9 @@ static int test__checkterms_simple(struct list_head *terms) /* config=10 */ term = list_entry(terms->next, struct parse_events_term, list); TEST_ASSERT_VAL("wrong type term", - term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG); + term->type_term == PARSE_EVENTS__TERM_TYPE_ATTR); + TEST_ASSERT_VAL("wrong type idx", + term->idx == 1); TEST_ASSERT_VAL("wrong type val", term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); TEST_ASSERT_VAL("wrong val", term->val.num == 10); @@ -472,7 +474,9 @@ static int test__checkterms_simple(struct list_head *terms) /* config1 */ term = list_entry(term->list.next, struct parse_events_term, list); TEST_ASSERT_VAL("wrong type term", - term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG1); + term->type_term == PARSE_EVENTS__TERM_TYPE_ATTR); + TEST_ASSERT_VAL("wrong type idx", + term->idx == 7); TEST_ASSERT_VAL("wrong type val", term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); TEST_ASSERT_VAL("wrong val", term->val.num == 1); @@ -481,7 +485,9 @@ static int test__checkterms_simple(struct list_head *terms) /* config2=3 */ term = list_entry(term->list.next, struct parse_events_term, list); TEST_ASSERT_VAL("wrong type term", - term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG2); + term->type_term == PARSE_EVENTS__TERM_TYPE_ATTR); + TEST_ASSERT_VAL("wrong type idx", + term->idx == 8); TEST_ASSERT_VAL("wrong type val", term->type_val == PARSE_EVENTS__TERM_TYPE_NUM); TEST_ASSERT_VAL("wrong val", term->val.num == 3); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 1e15df1..8fd2542 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -541,6 +541,19 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, return add_event(list, idx, &attr, NULL); } +int parse_events__set_attr(struct perf_event_attr *__attr, u64 idx, u64 val) +{ + __u64 *attr = (__u64 *)__attr; + + if (idx * sizeof(*attr) >= sizeof(*__attr)) + return -EINVAL; + + attr += idx; + *attr |= val; + + return 0; +} + static int config_term(struct perf_event_attr *attr, struct parse_events_term *term) { @@ -551,36 +564,17 @@ do { \ } while (0) switch (term->type_term) { - case PARSE_EVENTS__TERM_TYPE_CONFIG: + case PARSE_EVENTS__TERM_TYPE_ATTR: CHECK_TYPE_VAL(NUM); - attr->config = term->val.num; - break; - case PARSE_EVENTS__TERM_TYPE_CONFIG1: - CHECK_TYPE_VAL(NUM); - attr->config1 = term->val.num; - break; - case PARSE_EVENTS__TERM_TYPE_CONFIG2: - CHECK_TYPE_VAL(NUM); - attr->config2 = term->val.num; - break; - case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD: - CHECK_TYPE_VAL(NUM); - attr->sample_period = term->val.num; - break; - case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE: - /* - * TODO uncomment when the field is available - * attr->branch_sample_type = term->val.num; - */ - break; + return parse_events__set_attr(attr, term->idx, term->val.num); case PARSE_EVENTS__TERM_TYPE_NAME: CHECK_TYPE_VAL(STR); - break; + return 0; default: - return -EINVAL; + break; } - return 0; + return -EINVAL; #undef CHECK_TYPE_VAL } @@ -1277,7 +1271,7 @@ int parse_events__is_hardcoded_term(struct parse_events_term *term) static int new_term(struct parse_events_term **_term, int type_val, int type_term, char *config, - char *str, u64 num) + char *str, u64 num, u64 idx) { struct parse_events_term *term; @@ -1288,7 +1282,8 @@ static int new_term(struct parse_events_term **_term, int type_val, INIT_LIST_HEAD(&term->list); term->type_val = type_val; term->type_term = type_term; - term->config = config; + term->config = config; + term->idx = idx; switch (type_val) { case PARSE_EVENTS__TERM_TYPE_NUM: @@ -1307,17 +1302,17 @@ static int new_term(struct parse_events_term **_term, int type_val, } int parse_events_term__num(struct parse_events_term **term, - int type_term, char *config, u64 num) + int type_term, char *config, u64 num, u64 idx) { return new_term(term, PARSE_EVENTS__TERM_TYPE_NUM, type_term, - config, NULL, num); + config, NULL, num, idx); } int parse_events_term__str(struct parse_events_term **term, int type_term, char *config, char *str) { return new_term(term, PARSE_EVENTS__TERM_TYPE_STR, type_term, - config, str, 0); + config, str, 0, 0); } int parse_events_term__sym_hw(struct parse_events_term **term, @@ -1331,18 +1326,18 @@ int parse_events_term__sym_hw(struct parse_events_term **term, if (config) return new_term(term, PARSE_EVENTS__TERM_TYPE_STR, PARSE_EVENTS__TERM_TYPE_USER, config, - (char *) sym->symbol, 0); + (char *) sym->symbol, 0, 0); else return new_term(term, PARSE_EVENTS__TERM_TYPE_STR, PARSE_EVENTS__TERM_TYPE_USER, - (char *) "event", (char *) sym->symbol, 0); + (char *) "event", (char *) sym->symbol, 0, 0); } int parse_events_term__clone(struct parse_events_term **new, struct parse_events_term *term) { return new_term(new, term->type_val, term->type_term, term->config, - term->val.str, term->val.num); + term->val.str, term->val.num, term->idx); } void parse_events__free_terms(struct list_head *terms) diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index f1cb4c4..61bbe88 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -35,6 +35,8 @@ extern int parse_events_terms(struct list_head *terms, const char *str); extern int parse_filter(const struct option *opt, const char *str, int unset); #define EVENTS_HELP_MAX (128*1024) +#define PERF_ATTR_IDX(MEMBER) \ + (offsetof(struct perf_event_attr, MEMBER) / sizeof(__u64)) enum { PARSE_EVENTS__TERM_TYPE_NUM, @@ -43,12 +45,8 @@ enum { enum { PARSE_EVENTS__TERM_TYPE_USER, - PARSE_EVENTS__TERM_TYPE_CONFIG, - PARSE_EVENTS__TERM_TYPE_CONFIG1, - PARSE_EVENTS__TERM_TYPE_CONFIG2, + PARSE_EVENTS__TERM_TYPE_ATTR, PARSE_EVENTS__TERM_TYPE_NAME, - PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD, - PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE, }; struct parse_events_term { @@ -59,6 +57,7 @@ struct parse_events_term { } val; int type_val; int type_term; + u64 idx; struct list_head list; }; @@ -74,7 +73,7 @@ struct parse_events_terms { int parse_events__is_hardcoded_term(struct parse_events_term *term); int parse_events_term__num(struct parse_events_term **_term, - int type_term, char *config, u64 num); + int type_term, char *config, u64 num, u64 idx); int parse_events_term__str(struct parse_events_term **_term, int type_term, char *config, char *str); int parse_events_term__sym_hw(struct parse_events_term **term, @@ -97,6 +96,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, int parse_events_add_pmu(struct list_head *list, int *idx, char *pmu , struct list_head *head_config); void parse_events__set_leader(char *name, struct list_head *list); +int parse_events__set_attr(struct perf_event_attr *__attr, u64 idx, u64 val); void parse_events_update_lists(struct list_head *list_event, struct list_head *list_all); void parse_events_error(void *data, void *scanner, char const *msg); diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index a5808d1..8ef3f6c 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -59,12 +59,12 @@ static int sym(yyscan_t scanner, int type, int config) return type == PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW; } -static int term(yyscan_t scanner, int type) +static int attr(yyscan_t scanner, u64 idx) { YYSTYPE *yylval = parse_events_get_lval(scanner); - yylval->num = type; - return PE_TERM; + yylval->num = idx; + return PE_TERM_ATTR; } %} @@ -127,12 +127,12 @@ modifier_bp [rwx]{1,3} } { -config { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG); } -config1 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG1); } -config2 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG2); } -name { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NAME); } -period { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD); } -branch_type { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE); } +config { return attr(yyscanner, PERF_ATTR_IDX(config)); } +config1 { return attr(yyscanner, PERF_ATTR_IDX(config1)); } +config2 { return attr(yyscanner, PERF_ATTR_IDX(config2)); } +period { return attr(yyscanner, PERF_ATTR_IDX(sample_period)); } +branch_type { return attr(yyscanner, PERF_ATTR_IDX(branch_sample_type)); } +name { return PE_TERM_NAME; } , { return ','; } "/" { BEGIN(INITIAL); return '/'; } {name_minus} { return str(yyscanner, PE_NAME); } diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 4eb67ec..2bd285e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -40,7 +40,8 @@ static inc_group_count(struct list_head *list, %} %token PE_START_EVENTS PE_START_TERMS -%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM +%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW +%token PE_TERM_NAME PE_TERM_ATTR %token PE_EVENT_NAME %token PE_NAME %token PE_MODIFIER_EVENT PE_MODIFIER_BP @@ -51,7 +52,7 @@ static inc_group_count(struct list_head *list, %type PE_VALUE_SYM_HW %type PE_VALUE_SYM_SW %type PE_RAW -%type PE_TERM +%type PE_TERM_ATTR %type PE_NAME %type PE_NAME_CACHE_TYPE %type PE_NAME_CACHE_OP_RESULT @@ -375,7 +376,7 @@ PE_NAME '=' PE_VALUE struct parse_events_term *term; ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3)); + $1, $3, 0)); $$ = term; } | @@ -393,7 +394,7 @@ PE_NAME struct parse_events_term *term; ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, 1)); + $1, 1, 0)); $$ = term; } | @@ -406,27 +407,30 @@ PE_VALUE_SYM_HW $$ = term; } | -PE_TERM '=' PE_NAME +PE_TERM_NAME '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, (int)$1, NULL, $3)); + ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_NAME, + NULL, $3)); $$ = term; } | -PE_TERM '=' PE_VALUE +PE_TERM_ATTR '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, $3)); + ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_ATTR, + NULL, $3, $1)); $$ = term; } | -PE_TERM +PE_TERM_ATTR { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1)); + ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_ATTR, + NULL, 1, $1)); $$ = term; }