From nobody Thu Dec 18 22:15:20 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A663C77B75 for ; Tue, 2 May 2023 22:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbjEBWn2 (ORCPT ); Tue, 2 May 2023 18:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230244AbjEBWnB (ORCPT ); Tue, 2 May 2023 18:43:01 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CECC40FD for ; Tue, 2 May 2023 15:42:32 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1aae803a5eeso19482185ad.0 for ; Tue, 02 May 2023 15:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067342; x=1685659342; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f/8TJqkQ5vnLaKx87JVN8hYpVBFz1O0XRBKOdoWz1f8=; b=fJLhtbcVJey1ObHBX7e6uuf+KCbjSeSro+UcHz8JlILzgGuXpRzZRMT6by6TCbZChf 8PvOIQNhjP///PZpVyRJ3CQPZdunE23MqA5tymPAPgDRVG+tmEQoBjjWGVywMQetgDm+ XfELo5/lU9yamVrX2Pqq/W8xxoS/qJZyBWeYUH0jI3NeSUoEG4AH194IOTDbEzJkR+HS sHbBiaN90sB0se3XhSJf3R7MJhkxecGuo4CbNUhzGbf34ojsMw3INs8OCJg5EtCkqUTQ 9DHAsTkgVRXyWxpVkN3dJo8gqxx2P3In0rJ6/Av+GxHFAQqGWCK8YSrfmjYe+G+GK8Ci cz0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067342; x=1685659342; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f/8TJqkQ5vnLaKx87JVN8hYpVBFz1O0XRBKOdoWz1f8=; b=ND5pqt8G+gZiOZurzX3m3Snlflek/hLSm8Mf5FHvW652iJxpy7q+1BiDJXKWHwAETo O/wp6tOuu/ftu5LWRL5mlmh9gqkZx+5XOIPqL81G2zMFwCeM2GDPozGyvRaCnMUS4mKc tdnDXLIbVUCo3Q9hGJJoK/tvGRbKcOebJ0J0uBiC38xHbLWykSMNxeTRr+tRqlNjIh6w GeDwtMwAeu7amj1TISsswDRTx25F/mrSbt7V5CPVmdjorpoTwcjKaEHXrI1dqz72Zw9E m0U+yLioKhW42xt65u+d1VtNLndj9BEBZaD5r3ey0tPLz5Go+17TwuvCjwtxrMQv5lrU 6Y+Q== X-Gm-Message-State: AC+VfDxdcJ9r14yhqUQ39k97x3ANl71fJbzGaHUt6LubmvWcbxFOwjoM /mCxYLFU9Uj82vkB/TyrF3mIuSuDQT9P X-Google-Smtp-Source: ACHHUZ74WWJhk+5dD3m5Fo+4j9FiF3JPXm23LzxAChofkMmrwddZXcIUmphhU51K7DDz0bbQiNC5uL0FYE0W X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a17:902:8a96:b0:1a5:15bb:e3cb with SMTP id p22-20020a1709028a9600b001a515bbe3cbmr15025plo.12.1683067341882; Tue, 02 May 2023 15:42:21 -0700 (PDT) Date: Tue, 2 May 2023 15:38:33 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-27-irogers@google.com> Mime-Version: 1.0 References: <20230502223851.2234828-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v4 26/44] perf parse-events: Support wildcards on raw events From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Legacy raw events like r1a open as PERF_TYPE_RAW on non-hybrid systems and on each hybrid PMU on hybrid systems. Rather than iterate hybrid PMUs add a perf_pmu__supports_wildcard_numeric function that says when a numeric event should be opened upon it. If the parsed event specifies the type of the PMU then don't wildcard match PMUs, use the specified PMU type. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 50 ++++++++++++++++++++++++---------- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.y | 13 ++++++--- tools/perf/util/pmu.c | 5 ++++ tools/perf/util/pmu.h | 1 + 5 files changed, 52 insertions(+), 20 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index ec72f11fb37f..c8b4ec076825 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -25,7 +25,6 @@ #include "util/parse-branch-options.h" #include "util/evsel_config.h" #include "util/event.h" -#include "util/parse-events-hybrid.h" #include "util/pmu-hybrid.h" #include "util/bpf-filter.h" #include "util/util.h" @@ -1448,15 +1447,14 @@ int parse_events_add_tracepoint(struct list_head *l= ist, int *idx, #endif } =20 -int parse_events_add_numeric(struct parse_events_state *parse_state, - struct list_head *list, - u32 type, u64 config, - struct list_head *head_config) +static int __parse_events_add_numeric(struct parse_events_state *parse_sta= te, + struct list_head *list, + struct perf_pmu *pmu, u32 type, u64 config, + struct list_head *head_config) { struct perf_event_attr attr; LIST_HEAD(config_terms); const char *name, *metric_id; - bool hybrid; int ret; =20 memset(&attr, 0, sizeof(attr)); @@ -1474,19 +1472,41 @@ int parse_events_add_numeric(struct parse_events_st= ate *parse_state, =20 name =3D get_config_name(head_config); metric_id =3D get_config_metric_id(head_config); - ret =3D parse_events__add_numeric_hybrid(parse_state, list, &attr, - name, metric_id, - &config_terms, &hybrid); - if (hybrid) - goto out_free_terms; - - ret =3D add_event(list, &parse_state->idx, &attr, name, metric_id, - &config_terms); -out_free_terms: + ret =3D __add_event(list, &parse_state->idx, &attr, /*init_attr*/true, na= me, + metric_id, pmu, &config_terms, /*auto_merge_stats=3D*/false, + /*cpu_list=3D*/NULL) ? 0 : -ENOMEM; free_config_terms(&config_terms); return ret; } =20 +int parse_events_add_numeric(struct parse_events_state *parse_state, + struct list_head *list, + u32 type, u64 config, + struct list_head *head_config, + bool wildcard) +{ + struct perf_pmu *pmu =3D NULL; + bool found_supported =3D false; + + if (!wildcard) + return __parse_events_add_numeric(parse_state, list, /*pmu=3D*/NULL, + type, config, head_config); + + while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { + int ret; + + if (!perf_pmu__supports_wildcard_numeric(pmu)) + continue; + + found_supported =3D true; + ret =3D __parse_events_add_numeric(parse_state, list, pmu, pmu->type, + config, head_config); + if (ret) + return ret; + } + return found_supported ? 0 : -EINVAL; +} + int parse_events_add_tool(struct parse_events_state *parse_state, struct list_head *list, int tool_event) diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 4e49be290209..831cd1ff4702 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -166,7 +166,8 @@ int parse_events_load_bpf_obj(struct parse_events_state= *parse_state, int parse_events_add_numeric(struct parse_events_state *parse_state, struct list_head *list, u32 type, u64 config, - struct list_head *head_config); + struct list_head *head_config, + bool wildcard); int parse_events_add_tool(struct parse_events_state *parse_state, struct list_head *list, int tool_event); diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index cc7528558845..5055a29a448f 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -435,7 +435,8 @@ value_sym '/' event_config '/' =20 list =3D alloc_list(); ABORT_ON(!list); - err =3D parse_events_add_numeric(_parse_state, list, type, config, $3); + err =3D parse_events_add_numeric(_parse_state, list, type, config, $3, + /*wildcard=3D*/false); parse_events_terms__delete($3); if (err) { free_list_evsel(list); @@ -452,7 +453,9 @@ value_sym sep_slash_slash_dc =20 list =3D alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, NULL)= ); + ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, + /*head_config=3D*/NULL, + /*wildcard=3D*/false)); $$ =3D list; } | @@ -596,7 +599,8 @@ PE_VALUE ':' PE_VALUE opt_event_config =20 list =3D alloc_list(); ABORT_ON(!list); - err =3D parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4); + err =3D parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4, + /*wildcard=3D*/false); parse_events_terms__delete($4); if (err) { free(list); @@ -618,7 +622,8 @@ PE_RAW opt_event_config num =3D strtoull($1 + 1, NULL, 16); ABORT_ON(errno); free($1); - err =3D parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, num, = $2); + err =3D parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, num, = $2, + /*wildcard=3D*/true); parse_events_terms__delete($2); if (err) { free(list); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 63071d876190..cd4247a379d4 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1655,6 +1655,11 @@ bool perf_pmu__supports_legacy_cache(const struct pe= rf_pmu *pmu) return is_pmu_core(pmu->name) || perf_pmu__is_hybrid(pmu->name); } =20 +bool perf_pmu__supports_wildcard_numeric(const struct perf_pmu *pmu) +{ + return is_pmu_core(pmu->name) || perf_pmu__is_hybrid(pmu->name); +} + static bool pmu_alias_is_duplicate(struct sevent *alias_a, struct sevent *alias_b) { diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 05702bc4bcf8..5a19536a5449 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -221,6 +221,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu); =20 bool is_pmu_core(const char *name); bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu); +bool perf_pmu__supports_wildcard_numeric(const struct perf_pmu *pmu); void print_pmu_events(const struct print_callbacks *print_cb, void *print_= state); bool pmu_have_event(const char *pname, const char *name); =20 --=20 2.40.1.495.gc816e09b53d-goog