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 89463C77B75 for ; Tue, 2 May 2023 22:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbjEBWmD (ORCPT ); Tue, 2 May 2023 18:42:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjEBWlw (ORCPT ); Tue, 2 May 2023 18:41:52 -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 B46BC3A98 for ; Tue, 2 May 2023 15:41:19 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a7e76b32bso5496584276.1 for ; Tue, 02 May 2023 15:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067275; x=1685659275; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Qf6Qd+fJp/raw+o0EdprpNNrlfsXq40MPV/2YI8RBqA=; b=3VydHCm3HgLmx6zItjD+1wFhHOgcny1QSRaN3JIELmw2g1+8kUo1PNF2GtCA4vzcB7 XZ4D97vkLvkwLYfW99cCITs05raM8q4aKas0B6aBoFngrecoVIdqsQm3OxyxbEM4avbo 95oI8DfQkLA89kdERL9rh3AzfWNVbsPTAO78TAt5Qw2W4FmqRDJNmUWGRuaZ1GQ8FhLL D2pvTp5E1oLMLMEL83qdXu33mzrJ0uG/UlHRH6kPBDHpMH/4TytLwno+eKUGUJm/l0Iw PsW6Y9UhDutNVlGl9HcghLFy53aFt4qUb8Ey0yMuPBohy93WaJJw/Wmo2+wS1dGLA6dF 6Y5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067275; x=1685659275; 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=Qf6Qd+fJp/raw+o0EdprpNNrlfsXq40MPV/2YI8RBqA=; b=hX25eiwIsb0D3bsXvlzbJ13iKlrCbpOzwzzejdYG7HkS0MZN2uobHiUDW2INbxi4EJ vqM6EJAyfB0jhr4B7Aqc+MxQ3CTOy058lr6K/MIvWnqvfl7YsRuuXjzYO0DzYg3c1K2b qP59JtzIsV/1cm2COL2LTL+VknSQbA86QoaSnROyyCMvYbCNs5P9zlPjWADwtCeViaUD sR9nBmUkgIbOCeJP2IsZeEIhTsOSZejD2Q0Pt4NCU2eyU7KT0seuLSwbPzJSCN9hov0L 31d0sQlii3svsRHQxN9eua1YJ+VdqF3SsFPK2FZVQBxqd7Fl8jZ+gP+FHAdGj5zUWzVP hiEA== X-Gm-Message-State: AC+VfDzz2Ylqh5Pzt/hUrlSThBP/vK6Y/4zPCFDmcdnuV/i2DLVbP0lV ry06ytKgRmg6XpPQFxByQzxjB23m4pAz X-Google-Smtp-Source: ACHHUZ6/hhd6yEUy1giaHBhk/Dt9KBSzPepqdFaaTHsd+AwHkMOfSYDqQVzXja176m6G5LOonb3Z4bUJc/fF X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a25:584:0:b0:b9e:5d82:f542 with SMTP id 126-20020a250584000000b00b9e5d82f542mr2875249ybf.5.1683067275451; Tue, 02 May 2023 15:41:15 -0700 (PDT) Date: Tue, 2 May 2023 15:38:23 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-17-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 16/44] perf parse-events: Set pmu_name whenever a pmu is given 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" Change add_event to always set pmu_name when possible as not all code checks both pmu->name and evsel->pmu_name, for example, uniquify_counter in stat-display.c. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 707c53f1be09..9cb5f040a74c 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -269,6 +269,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.requires_cpu =3D pmu ? pmu->is_uncore : false; evsel->auto_merge_stats =3D auto_merge_stats; evsel->pmu =3D pmu; + evsel->pmu_name =3D pmu && pmu->name ? strdup(pmu->name) : NULL; =20 if (name) evsel->name =3D strdup(name); @@ -1500,12 +1501,7 @@ int parse_events_add_pmu(struct parse_events_state *= parse_state, /*metric_id=3D*/NULL, pmu, /*config_terms=3D*/NULL, auto_merge_stats, /*cpu_list=3D*/NULL); - if (evsel) { - evsel->pmu_name =3D name ? strdup(name) : NULL; - return 0; - } else { - return -ENOMEM; - } + return evsel ? 0 : -ENOMEM; } =20 if (!parse_state->fake_pmu && perf_pmu__check_alias(pmu, head_config, &in= fo)) @@ -1561,7 +1557,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, if (evsel->name) evsel->use_config_name =3D true; =20 - evsel->pmu_name =3D name ? strdup(name) : NULL; evsel->percore =3D config_term_percore(&evsel->config_terms); =20 if (parse_state->fake_pmu) --=20 2.40.1.495.gc816e09b53d-goog