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 4066DC19F20 for ; Tue, 2 May 2023 22:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjEBWmA (ORCPT ); Tue, 2 May 2023 18:42:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230130AbjEBWld (ORCPT ); Tue, 2 May 2023 18:41:33 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40E5735AF for ; Tue, 2 May 2023 15:41:03 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-55a37bf6fd0so57612457b3.2 for ; Tue, 02 May 2023 15:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067261; x=1685659261; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=qB7CrIho8sUs4uqST1FvQg7dTPewP8sCTz3Jefkl1h4=; b=lxncKhMnNm9yFOauI/N4W5skagugkDlwjtW8YKG0Z7fL9go5oid+Ip5dfz0RBDrtm8 Cn5OSc0aAfkha9Xfr9K0s5vhlCOkIRVaS25FJ9Fa22A2dmjDgmlGJQInogoCBWMKWCqV it/njqtjFK133gTeKWhtiIuK7AeabaX5sLljn1DEuUUeomRHq0xjAqbDD5NqFhwEypq9 ObR3KQ+GF7IuKSSu8cF2J4O3Ds4KWcGFWSiRipPo0nz1/+Z5kO6O5Br8g2pjm2RBImMn vj1E4YBYtdpgltVEO/jh/Vbeo/n7TkkB8V7qO2mko1XDTW++v7TiggWVXcoFNVBxQ7U3 eTjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067261; x=1685659261; 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=qB7CrIho8sUs4uqST1FvQg7dTPewP8sCTz3Jefkl1h4=; b=lHgonR7/CdYGp58DKI8/oZPZSWp7qEHo6xxHzPhvDWz8TrMn4BCnaW7LXiYnpaQ6hQ AsSNRduuRV+ffb7fwq/f4qZwzjMqp/YP+VZkdYsLGvq/Q2Ax+tzL83Cy5/NUjiziF81C ZWkTYavqxZh+X56xbITSOCqI92pWsB0U6Swskf4ic+TlGs17VKyd2aObzBN2QWvOH9oX RnITUbJykbab/plXxrPBu5L5FqQUfkwwRS3fVBmmeY6vzEj1kTQ2Uxm+qtOfk8lAen4i Ep8NaNmGwlYagpvqZC5442OGwpF9cGjhX3k0trJQt0omue5WhWcGntuU+Vtiol0sKnPj YT2A== X-Gm-Message-State: AC+VfDxSatEX1J2Ov1KZ6EF6eDxBlDSYakkfTyn1AbCEHGk3wy12s/s3 DY5R39bwCWbD7ZF5AFJcLU8ONoeXJ1RZ X-Google-Smtp-Source: ACHHUZ4BXwblVCTqfQe8rNR9zxb8oNAJOcUiEgLwFKM9aond1w34GGfJmV324wZvZhCPjFMEgtlsVPuViT2Z X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a81:a8c4:0:b0:54d:3afc:d503 with SMTP id f187-20020a81a8c4000000b0054d3afcd503mr11162592ywh.8.1683067261442; Tue, 02 May 2023 15:41:01 -0700 (PDT) Date: Tue, 2 May 2023 15:38:22 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-16-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 15/44] perf parse-events: Set attr.type to PMU type early 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" Set attr.type to PMU type early so that later terms can override the value. Setting the value in perf_pmu__config means that earlier steps, like config_term_pmu, can override the value. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 2 +- tools/perf/util/pmu.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 34ba840ae19a..707c53f1be09 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1492,9 +1492,9 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, } else { memset(&attr, 0, sizeof(attr)); } + attr.type =3D pmu->type; =20 if (!head_config) { - attr.type =3D pmu->type; evsel =3D __add_event(list, &parse_state->idx, &attr, /*init_attr=3D*/true, /*name=3D*/NULL, /*metric_id=3D*/NULL, pmu, diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index ad209c88a124..cb33d869f1ed 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1398,7 +1398,6 @@ int perf_pmu__config(struct perf_pmu *pmu, struct per= f_event_attr *attr, { bool zero =3D !!pmu->default_config; =20 - attr->type =3D pmu->type; return perf_pmu__config_terms(pmu->name, &pmu->format, attr, head_terms, zero, err); } --=20 2.40.1.495.gc816e09b53d-goog