Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3035069rwr; Fri, 28 Apr 2023 22:39:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5UJHs6Uq2IdI5HIwazK5UFulG1+yTR/br/0nfRfQ9m0e5lTbA6WitwODP2FEEQc47g1f++ X-Received: by 2002:a05:6a20:8e19:b0:f6:9492:93b8 with SMTP id y25-20020a056a208e1900b000f6949293b8mr8100453pzj.3.1682746759420; Fri, 28 Apr 2023 22:39:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682746759; cv=none; d=google.com; s=arc-20160816; b=wHgLt8n1V+14jAJYYVBLoIRx+4/oKfjxoP6rYG0QOKCBYCRcXxGa+XWiK/97uOrNJ/ Zrs04l1XHVjwvP3t/rarSRVTqH/kLhSN8I1xFDesyvcOE0zt3bY6aTHE3HuzbMI4zdY4 09PgqakyCTe6UEQdL3Oh5Gtlsu1WPtz6XFZWeqKVFTQpQxMPtB4As0m3wKoqIiHqCa6d SF6H796Y9uF6n42Q2CUs44w3cv+xdFg5Pf9Uqlh5IxzTL6yaUBcPuwRHk2ZPsHWA6hez 2Mpa/OnU9XM5Ui6jdAHKYHPZJQkhsJms/yyqkaSGXtM21TpTB5yHuv8gluzT6ysYGTNQ PdbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=qB7CrIho8sUs4uqST1FvQg7dTPewP8sCTz3Jefkl1h4=; b=UjbGR4amU7EDbuccXtgLBQvX+kqu+3PAd8al9xqOcKQOv+rSJ5UFUcKkaM7Ra269wd VgQeCteR+Q6Wz8NFMtJpN4/c0a5PnQ43G/d4JW/PjffLzFE454LuXMo6THp4bfS7AWl9 v677hNBz95TwyikCBSbtIJstdMEvdMyG/A++ZmyATtf4Yp2cNWR2IUD7kffbKm3ejccN ZVBdDJyR1Wt3LPA9krOAqAR5yeEYUZXq5xayQvddEkzbDU+5cChEDodJ1uf2k3fU4e4c BYTT8bvDUolHu46pPie17c0/IaN1MawCsPDQr1uiqc1q8UPrL6FsX2i/Y2F/UQ27CW99 bzVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="7gxKY/CX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y10-20020a63fa0a000000b005001391ef6bsi22681421pgh.108.2023.04.28.22.39.06; Fri, 28 Apr 2023 22:39:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="7gxKY/CX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347294AbjD2FiZ (ORCPT + 99 others); Sat, 29 Apr 2023 01:38:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347277AbjD2FiJ (ORCPT ); Sat, 29 Apr 2023 01:38:09 -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 9381C2D55 for ; Fri, 28 Apr 2023 22:37:43 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a7ba919dcso1032093276.1 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=VNUNnURYJonuHR7YdquauqeN/cG8jJ+qOJ108z5jdkuAJyCvcBqQJ4e2Nn8nngPFTQ JI8qmlDpraQ5EK8AZO/jPmJH0InA7ikCXLX2vYw6BE+JqVNZQ7smFPqC3cevO1yVBJ8b vnyTXiKZq5OaYgZO9yqEnC9PTWHz6rzJmEyM/BRQ7NhBGb54j5on8wYvhPijLhp8+z8N 0FN+rRSa31CpzJ6dF1Wc1302C2PGw6LMIRK4bJ8j1DyK6gEl4X8d6PAMF9j44zOROxmQ 6nlHrDQpTiavsbB68kaC8zti0D/j8Q7S+KMVFFbIbo2Ser5eQPgfK0u/J0G9R0lNCLV7 gNRA== X-Gm-Message-State: AC+VfDy+iymJFg/4PugYHd91gZ7zHUT+b2EHvJP14lS1eilGeoEQtkfX ElKUO7NExavgGsjZRPazuBOSBHDvpVb2 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" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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