From nobody Tue Dec 16 14:06:36 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36F5528CF4A for ; Sun, 5 Oct 2025 18:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759688696; cv=none; b=c/eh7lgT4XTEkDhFPb+LZby+QnFobzkdDV5qJ3YQt3UNqu9I8oo1PrQAgxe7wvNKEWukehrvagS/GqgECrP9jr45z/yntTI4fu+8ZlXJ96+7IKcbstKNx8GeZMfWjZ7o9TSVK0+K0lroZGIARhhbyXM3+THUG0Ns6p6/cbh0naM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759688696; c=relaxed/simple; bh=6p43zhgfxzOqfth9ihxTy+OAOu1uvEgAxqAGt//52mo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B4EynEHriqUE480wdELhpoUnofn0XihApHNacZje4r7JKbmt7h1hTme8wzM6Xygb9H6GJsfgXeR/oysZjrB3m57uRuhZ6Udr4iRUw1Qx01WQKeqh7IPNu2jvSupVUmlHnp+Hm505u/Sokx8IATzqqJzFhIBhjNMSesrXVgtR/8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pJ4nOr6j; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pJ4nOr6j" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-277f0ea6fc6so96499845ad.2 for ; Sun, 05 Oct 2025 11:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759688694; x=1760293494; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UK+9vKYDI5SO95JZJfkR0FuzR6EHsxaM13pctEfDrUM=; b=pJ4nOr6j6wXa9YC4owfswi3NkR5iDXJ1Kp82bDtTlLatvgr+viLkQ/jjGOP9WuQe6T BOF4uZ9D+bR/UnergMQiCRHR3/5HqfuC7OWTz75bVT1mvDuATSti3VgsRO030TbcPk3M 7R/s/+5COpBFsFaY7pFgAsPMjz/uq/ZI82YzLrO45w6FB74uPy0GzgGbz5mf3YUBdyiZ NOL+cPlr82KBfrWi2q36vyEzu9lwvawl3Sy1qT517Bhm1vT6lppPhdon4lWK0DhntqAM 1MHMRXd2a6OwJnyy0JBAZtpQ+lvHYIWCVNpPUjoT5S2/GUG5fdD76azAUl3vfd6SKyoy tZqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759688694; x=1760293494; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UK+9vKYDI5SO95JZJfkR0FuzR6EHsxaM13pctEfDrUM=; b=VRrT0CnAnhQYa7ZL128rqGrH0Q5XRDiMauroUUHYG+51oaEoFsTV/VtC7sMYA9Vxl5 72TVfKcn7NUfFonxjZ+hNYYb7MR4wMCTBGJIRcU60ZLvUXgKHpjJ6hXC6aXx0dABIDhB oHaTb25SDB0oSwk+7WAOMeyYTVk0M/xtzL4ZPbiUsMLjC1IYjJW2JNNhQgHoMEQbwRt+ ncCaLGDWiLrhrLRc+VimBbwYrBPXjsfJfOTNFVdgwKWing8tsfA3PvdDfxrP6ikAT+S4 tpW0nXqXJxI1qpb12qr0KJGrT9IuEu7LkUM07YUqjHc5VlyO+4afnqmxBB6F6+XsEHw/ jHgg== X-Forwarded-Encrypted: i=1; AJvYcCVn6644upQCPokK1xCxtVx8MssdqYQeGnAxagCjFESUviRrF3Z9YLtyddcqt4tt3nXCaOA0ZAoMH6CAFik=@vger.kernel.org X-Gm-Message-State: AOJu0YynOGK/DBSb+cVk6kfwejSHYkNnI/x7ymoYc9gBeSWOuxlY4r6u CMJWgXRQaIfo+A735rQgP5eu7NVu+mq0jnfGvHBiOX6NzVXmCNNd+ImzKkGzE8eNeZTV6qgxawY QaI1WuISV7g== X-Google-Smtp-Source: AGHT+IFi+hH2WneunbqqhaE8Ef1ChJUxSeOfMr0ECoCsbafDNVNagVd87dwIdieJ8xXqAMa60zcvqumJrM3I X-Received: from plsp10.prod.google.com ([2002:a17:902:bd0a:b0:267:a5c9:8a4c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3807:b0:28d:18d3:46ca with SMTP id d9443c01a7336-28e9a6be420mr122481015ad.49.1759688694620; Sun, 05 Oct 2025 11:24:54 -0700 (PDT) Date: Sun, 5 Oct 2025 11:24:12 -0700 In-Reply-To: <20251005182430.2791371-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251005182430.2791371-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251005182430.2791371-10-irogers@google.com> Subject: [PATCH v7 09/27] perf pmu: Factor term parsing into a perf_event_attr into a helper From: Ian Rogers To: James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan , Vince Weaver Cc: Ian Rogers , Thomas Richter Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Factor existing functionality in perf_pmu__name_from_config into a helper that will be used in later patches. Tested-by: Thomas Richter Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 7992bd923515..2c3e539851c4 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1763,6 +1763,24 @@ static int check_info_data(struct perf_pmu *pmu, return 0; } =20 +static int perf_pmu__parse_terms_to_attr(struct perf_pmu *pmu, const char = *terms_str, + struct perf_event_attr *attr) +{ + struct parse_events_terms terms; + int ret; + + parse_events_terms__init(&terms); + ret =3D parse_events_terms(&terms, terms_str); + if (ret) { + pr_debug("Failed to parse terms '%s': %d\n", terms_str, ret); + parse_events_terms__exit(&terms); + return ret; + } + ret =3D perf_pmu__config(pmu, attr, &terms, /*apply_hardcoded=3D*/true, /= *err=3D*/NULL); + parse_events_terms__exit(&terms); + return ret; +} + /* * Find alias in the terms list and replace it with the terms * defined for the alias @@ -2596,21 +2614,8 @@ const char *perf_pmu__name_from_config(struct perf_p= mu *pmu, u64 config) hashmap__for_each_entry(pmu->aliases, entry, bkt) { struct perf_pmu_alias *event =3D entry->pvalue; struct perf_event_attr attr =3D {.config =3D 0,}; - struct parse_events_terms terms; - int ret; + int ret =3D perf_pmu__parse_terms_to_attr(pmu, event->terms, &attr); =20 - parse_events_terms__init(&terms); - ret =3D parse_events_terms(&terms, event->terms); - if (ret) { - pr_debug("Failed to parse '%s' terms '%s': %d\n", - event->name, event->terms, ret); - parse_events_terms__exit(&terms); - continue; - } - ret =3D perf_pmu__config(pmu, &attr, &terms, /*apply_hardcoded=3D*/true, - /*err=3D*/NULL); - - parse_events_terms__exit(&terms); if (ret =3D=3D 0 && config =3D=3D attr.config) return event->name; } --=20 2.51.0.618.g983fd99d29-goog