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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48478C77B60 for ; Sat, 29 Apr 2023 05:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347285AbjD2FiZ (ORCPT ); Sat, 29 Apr 2023 01:38:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347276AbjD2FiJ (ORCPT ); Sat, 29 Apr 2023 01:38:09 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4756C46B1 for ; Fri, 28 Apr 2023 22:37:43 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a753ce33cso1005613276.2 for ; Fri, 28 Apr 2023 22:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746657; x=1685338657; 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=7gxKY/CXr66YpcHpzLZE2nsQ7TZrubJwCdqtd2TR9kfo1sD5akgNOPK4YrdA4XcK/x jLE4EPEwYK+C38VKN93Huvo8z30gwGjl+Dx7XDf2LXOtk0ffRww+TxoJS/5b1sUfrGYd y4DWtE33wbxwHVHmQtDW/KDsS1YxOSmfmWRgJIsh2H8peRCWEPRpKyIdt9p10d5E5Xvx eeYXTc1VWWnI9hGpTfUJOr0q/MUVjiDC/q0mdr5qejd4EkLOZ6miPm8MagodLwREHeEz AcIf8v+IlpQil8C9aYCqcrkTAKtFrvG1OFkHQqrk7OsSSlNXECp1BvEUu0RFtOfJgfGj oCQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746657; x=1685338657; 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=k0faiSFWmpMOp+pNaFyJy9HiltzykgOvQqpqOnXZyg89NUOEcPJkmw5OQwjKv/FxHe A8liWpJDW/rCG4KKTZZs0pCdST50HYBvTMSPRunpIYOhyp8UIvGWnVuSLlR3OuKGllaP 6obA+6p4oaNV4ky6OXb1po7rpcTr0BCOTgZQ1uJV3Ibjg0Fh/9kg8mhrnxeaZtnjHWDG 2rFw9vdx3IbBeOiyuTpbVwgxorBkJ78xwyZKMDk2m9QsV254akElyW8uvFTwEI1NWFWx Z3XUFsjsJBIOG0/G6w6ZNy0o31u9MkrzuT26z6n/BYZZck/+oyUAlYS+pFJ7A8YxRkl1 jnWQ== X-Gm-Message-State: AC+VfDy8uNVaw0/USO2xH/YY+qpntgwyizBqKRSHD0cc8ha979+j9XcZ MAnFtFmEvqBpchH2cGJV2bZadZTWDPCa X-Google-Smtp-Source: ACHHUZ6vNySFlcMODgCnig3lQZyAoM6qXdID05lwe4DrriZsJrlozcR43ce5m25/RCiZAtzPVNi70WGqvciq X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a25:7495:0:b0:b68:7a4a:5258 with SMTP id p143-20020a257495000000b00b687a4a5258mr4265164ybc.3.1682746656744; Fri, 28 Apr 2023 22:37:36 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:37 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-18-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 17/46] 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 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 *parse_state, } else { memset(&attr, 0, sizeof(attr)); } + attr.type = pmu->type; if (!head_config) { - attr.type = pmu->type; evsel = __add_event(list, &parse_state->idx, &attr, /*init_attr=*/true, /*name=*/NULL, /*metric_id=*/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 perf_event_attr *attr, { bool zero = !!pmu->default_config; - attr->type = pmu->type; return perf_pmu__config_terms(pmu->name, &pmu->format, attr, head_terms, zero, err); } -- 2.40.1.495.gc816e09b53d-goog