From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A3ECC433F5 for ; Fri, 15 Oct 2021 17:22:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 74BD5611C1 for ; Fri, 15 Oct 2021 17:22:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242337AbhJORY7 (ORCPT ); Fri, 15 Oct 2021 13:24:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242346AbhJORYd (ORCPT ); Fri, 15 Oct 2021 13:24:33 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6368C061767 for ; Fri, 15 Oct 2021 10:22:14 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id b189-20020a3799c6000000b0045eb0c29072so7259513qke.12 for ; Fri, 15 Oct 2021 10:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=jB5i04mXIrt5IWBLbRZrZOzlwvD40hhkm6eSih9HOlU=; b=DsoqFLKXS9zdB/bK/7EtQHxCHieD73ZgcXfQDnkOL6jRQU2eIeZfa1O43Q956AwZQC F54bDDECrTZLWlZnAVKtyUDlUPkjE1XkH3tTqeOU12eP1Uj+INaby0glO3l0n2FAA2lE 1HlapEOWIhfsi/YpWMUbw3RdBkIrDcWzUsTaLeQImsrYBL4+R+WY58lEluf9O0N7LFoF R05DXKFznh2PHYV7hPwiUnP/wqOV7FJDnArNQPG47u/OgUNVIL2uBGrHUO0/SkRVnHq3 AOEqVYx9l2XJW8dqEDxs4AZfnV+QweXfMgOmjbTM801C19SmaBasagqtQdPhhI0aqgDG MnYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=jB5i04mXIrt5IWBLbRZrZOzlwvD40hhkm6eSih9HOlU=; b=20vkA/5VaMsHfoYmISSZyJ8eaMxIQOhZCogrCT1f5NNni66te5VXr8obfp3hvItbHP wMY5E/d9Zb3RJu1/UZcorqPA1y43yMleJioPK4ROGbNc2UJG7ejPH1Txs+q6ftoODZUc s56O+HMNAasQgLs7bwjJdsMY0ko3WFmw9PMIOhOCHg6ZIUlpM5CQ/r6z1YH/qIMDwFxj XLQSRuTxS0onXLJeneLjnIMmE7RSVLMAT9V4x0dYvvBJc74NKWhoUeRGIlBCxeVmxckv qNC4Of2qo0drrrcAUYDTQAPEbPNGrZhrtMYWlsfTCuP7D0SFpO0XXCiBEQcJluE91J5S xtyw== X-Gm-Message-State: AOAM531LoEkY4mw4fr7pVSjmMDzkbRYbMokRA2IAcuu2Qv2lNjgBK+ln WHmKg29Ds010Byb0TTJVazlgt/HeeWyX X-Google-Smtp-Source: ABdhPJz9T8LpkqyMIRizYCHj9ixCDsCSOb5+1QiDqO3OV3p1KYgzoPC5QfFSLe/Um5mPMMzT8VP9QJ+JsgwW X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:69bc:7451:58ad:6585]) (user=irogers job=sendgmr) by 2002:ac8:1e0e:: with SMTP id n14mr14701906qtl.95.1634318533830; Fri, 15 Oct 2021 10:22:13 -0700 (PDT) Date: Fri, 15 Oct 2021 10:21:26 -0700 In-Reply-To: <20211015172132.1162559-1-irogers@google.com> Message-Id: <20211015172132.1162559-16-irogers@google.com> Mime-Version: 1.0 References: <20211015172132.1162559-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 15/21] perf parse-events: Allow config on kernel PMU events From: Ian Rogers To: Andi Kleen , Jiri Olsa , Jin Yao , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Kees Cook , Sami Tolvanen , Nick Desaulniers , Andrew Morton , Jacob Keller , Zhen Lei , ToastC , Joakim Zhang , Felix Fietkau , Jiapeng Chong , Song Liu , Fabian Hemmer , Alexander Antonov , Nicholas Fraser , Adrian Hunter , Denys Zagorui , Wan Jiabing , Thomas Richter , Sumanth Korikkar , Heiko Carstens , Changbin Du , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andrew Kilroy Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An event like inst_retired.any on an Intel skylake is found in the pmu-events code created from the pipeline event json. The event is an alias for cpu/event=0xc0,period=2000003/ and parse-events recognizes the event with the token PE_KERNEL_PMU_EVENT. The parser doesn't currently allow extra configuration on such events, except for modifiers, so: $ perf stat -e inst_retired.any// /bin/true event syntax error: 'inst_retired.any//' \___ parser error Run 'perf list' for a list of valid events Usage: perf stat [] [] -e, --event event selector. use 'perf list' to list available events This patch adds configuration to these events which can be useful for a number of parameters like name and call-graph: $ sudo perf record -e inst_retired.any/call-graph=lbr/ -a sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 1.856 MB perf.data (44 samples) ] It is necessary for the metric code so that we may add metric-id values to these events before they are parsed. Acked-by: Andi Kleen Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 66 ++++++++++++++++++---------------- tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 17 +++++++-- 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 89494b6213a6..006a7f721549 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1673,44 +1673,50 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, } int parse_events_multi_pmu_add(struct parse_events_state *parse_state, - char *str, struct list_head **listp) + char *str, struct list_head *head, + struct list_head **listp) { struct parse_events_term *term; - struct list_head *list; + struct list_head *list = NULL; struct perf_pmu *pmu = NULL; int ok = 0; + char *config; *listp = NULL; + + if (!head) { + head = malloc(sizeof(struct list_head)); + if (!head) + goto out_err; + + INIT_LIST_HEAD(head); + } + config = strdup(str); + if (!config) + goto out_err; + + if (parse_events_term__num(&term, + PARSE_EVENTS__TERM_TYPE_USER, + config, 1, false, &config, + NULL) < 0) { + free(config); + goto out_err; + } + list_add_tail(&term->list, head); + + /* Add it for all PMUs that support the alias */ list = malloc(sizeof(struct list_head)); if (!list) - return -1; + goto out_err; + INIT_LIST_HEAD(list); + while ((pmu = perf_pmu__scan(pmu)) != NULL) { struct perf_pmu_alias *alias; list_for_each_entry(alias, &pmu->aliases, list) { if (!strcasecmp(alias->name, str)) { - struct list_head *head; - char *config; - - head = malloc(sizeof(struct list_head)); - if (!head) - return -1; - INIT_LIST_HEAD(head); - config = strdup(str); - if (!config) - return -1; - if (parse_events_term__num(&term, - PARSE_EVENTS__TERM_TYPE_USER, - config, 1, false, &config, - NULL) < 0) { - free(list); - free(config); - return -1; - } - list_add_tail(&term->list, head); - if (!parse_events_add_pmu(parse_state, list, pmu->name, head, true, true)) { @@ -1718,17 +1724,17 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, pmu->name, alias->str); ok++; } - - parse_events_terms__delete(head); } } } - if (!ok) { +out_err: + if (ok) + *listp = list; + else free(list); - return -1; - } - *listp = list; - return 0; + + parse_events_terms__delete(head); + return ok ? 0 : -1; } int parse_events__modifier_group(struct list_head *list, diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index c6c8343d311b..07f879e525fe 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -205,6 +205,7 @@ struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr, int parse_events_multi_pmu_add(struct parse_events_state *parse_state, char *str, + struct list_head *head_config, struct list_head **listp); int parse_events_copy_term_list(struct list_head *old, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index d94e48e1ff9b..17c8c66f3f51 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -342,7 +342,20 @@ PE_KERNEL_PMU_EVENT sep_dc struct list_head *list; int err; - err = parse_events_multi_pmu_add(_parse_state, $1, &list); + err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list); + free($1); + if (err < 0) + YYABORT; + $$ = list; +} +| +PE_KERNEL_PMU_EVENT opt_pmu_config +{ + struct list_head *list; + int err; + + /* frees $2 */ + err = parse_events_multi_pmu_add(_parse_state, $1, $2, &list); free($1); if (err < 0) YYABORT; @@ -357,7 +370,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc snprintf(pmu_name, sizeof(pmu_name), "%s-%s", $1, $3); free($1); free($3); - if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0) + if (parse_events_multi_pmu_add(_parse_state, pmu_name, NULL, &list) < 0) YYABORT; $$ = list; } -- 2.33.0.1079.g6e70778dc9-goog