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 AA351C77B61 for ; Fri, 28 Apr 2023 07:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345609AbjD1Hlg (ORCPT ); Fri, 28 Apr 2023 03:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345676AbjD1HlE (ORCPT ); Fri, 28 Apr 2023 03:41:04 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B41E524D for ; Fri, 28 Apr 2023 00:40:42 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9968fb4a8cso11646907276.0 for ; Fri, 28 Apr 2023 00:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682667639; x=1685259639; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iVN+WtVBinIPas0ggbaTczLlntAFDczu4JgyAZ0ncIE=; b=Ln4Z1Mzd7ToDZx8sos6KrvSnFRITAhaqld/WXl01VdbV21CgcnvaGqWKkTtvqmIA9t /cVXO94qnUMwcSZ+z7ACeG2gm16c44Qj/Yv0RcWnD4cj4YQHdJvp/igoLteZzaqG4tX9 QJ8efo4ELIz2zxTEUSmK4iNdspz6cq8Q244VkgNJDb6jQb4qn7a0HQ5fNa7pGdmSG3+i AJXE20eTL3f9TLnujtMML9b3kcJoeGXjFPtApmVHOPl+HlD52aJIO/w/Gq3cMVzbIe/f O4nqaf/l8ETMC0vWqXdUPdIMJaPLroaRi92EujrdIP+ebl85b4fFN/Nh+ULL5VxWqeBr klsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682667639; x=1685259639; 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=iVN+WtVBinIPas0ggbaTczLlntAFDczu4JgyAZ0ncIE=; b=fez0nyngu8LpPBKmW1VK7D9MDKTN0m3xMoG3Bs8Tdn/q/ORziziLSdHNJ0Bt+jJGEk TimBEhUHbqKc6mICjz1wavwK1VSjxQ2JTb2O0OQ0HCbrNoKVpfTGZQM0DW4QhkhAK4uu dRJhk5yYkGI5RJJb/OTJoT1gTnGUFYD07PK/9uitbrpu+CcUZ+YC4v5x/GOvuPhQ2MWh e2mGI7Uj/LI1oa/X5KWLHhkKco2veVChtsB7+LwFseNF3vnVT/X5TS8uaKHW0c3C52Wu 1Gzwx6SgExJK9QCgevqMmsVq8xftqFmoGxkeSqQTJ75nYdC+emYEgI3z4h3FV/Qx5rXP MmeA== X-Gm-Message-State: AC+VfDzWXgm+d5IhpGebiU8XRKKATgGqR58n+M9JPwjOMLmuQAdIJbGR sglILdv2Aj9wtK9cCFcS0NNbkKmD9vf4 X-Google-Smtp-Source: ACHHUZ5hN23+fVpX6ccKkZSOr31HcPGBhO6A+/DBexP4RgOR+EgfuvMFhTL11MoYu1TCu2K9WOdhU2Vp+u6c X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:24a7:aeb5:5de4:c29b]) (user=irogers job=sendgmr) by 2002:a05:6902:1241:b0:b99:465f:9000 with SMTP id t1-20020a056902124100b00b99465f9000mr1758587ybu.9.1682667639646; Fri, 28 Apr 2023 00:40:39 -0700 (PDT) Date: Fri, 28 Apr 2023 00:37:41 -0700 In-Reply-To: <20230428073809.1803624-1-irogers@google.com> Message-Id: <20230428073809.1803624-16-irogers@google.com> Mime-Version: 1.0 References: <20230428073809.1803624-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v2 15/43] 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 d71019dcd614..4ba01577618e 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