From nobody Fri Oct 10 08:28:09 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 8212F1EDA3C for ; Mon, 16 Jun 2025 05:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750050955; cv=none; b=lEuzjHfUHQD01dGW7wRH7sZgoPKZzWXsa94pA1Dt2AW38l8PELQU1Rw6QbapC3q8vqsyxgpD7FQsYPguGvjPjQXtqm009Tnq+GcweTe3YySpd9g+rSqc5YbLNCLni5D9RfArhTzuV3aG1HZqPpgow/ZsPLbvoqBXeA/gfP96Ehw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750050955; c=relaxed/simple; bh=Oml9++Abq7g3FkDJmOrjARftTN1uoBIInMWrq2h0mFk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Fc55lTWnHUjTcD6QBxOPpPiD02PiCiCSnrbWra9UCTAha9V4Aw23L/zv7h7s2CCc8SlG1o8Rbp2UNUDHlLYKfgEOLzpez7D/bT1cd/7T5R/75SjxlKW4CqXk57Ovm8CkkmZamfiau3M9yjP8HxNboqH2mZvmTjQ8lgVqxfdm+Yk= 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=zTyugVBm; arc=none smtp.client-ip=209.85.216.74 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="zTyugVBm" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-313c3915345so5263868a91.3 for ; Sun, 15 Jun 2025 22:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750050953; x=1750655753; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=InwfgEsJlVa5WtWhUcLkvO5lR5T2Ob+LyUCpO5IsVdU=; b=zTyugVBmUoYX4EqGi5BkS4wj2rf/8q0KMZ2lUa5mGcOvq/bCfZBy8AVEN4ssF1aPtw zmJoe98msqVziZXLXJQIko2C4UvEjdlX29FZPqMEBg8XiA9Ao8e8hPzZc2BHR60xTJgi Rte9wZzipP3pOhK32mNa6DnBrSAFd2KCLaYCr41IvV03CneZ+GrI7JVr42785DqB4j78 20yELtRevrTB8qsUrzBbAdj/LkJupY3bQu9YiYAUjabxtMM9rdyQhooKdT2JqzjogXjw 8HNz+jZ/M+GqhOrmj9Fud08spqMWBU8tpoyJT8axak1zXo94MUvQ3TXcmRlyurzMQOX1 7Y7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750050953; x=1750655753; h=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=InwfgEsJlVa5WtWhUcLkvO5lR5T2Ob+LyUCpO5IsVdU=; b=hA1tCYDsnecRbUixxx3Cf+mmMHUMW8nakCMaZn0ivxz3xgIB6AGxI/0tEcXBQoshR+ Oq2eDynnkmf+N1U8Zqg6zSlbGyJrQD+HVrnmTpg6FLWhvUx3Hj42yqfpOU9ScqgAdTQ3 DrdVkoP3dhfA+R/wQVfmS5JRI1B/bE0y1IF1Kc4LX6NCp4X1Qm7Pg07ugt8ajkSaDVig 15B8P2OJLd46Xy8Qy5lUXOPkyAhr61oJrK9x7BwRKqEJxtoCdchHq9/zcHGjTJ/7UGj/ 1oCIxiSW5xUtZRbNzMe55CZKGt/Igh7utIWy5QS5qlcBE0Gj+18qBENnvCvX8rPII9B1 ZCnQ== X-Forwarded-Encrypted: i=1; AJvYcCXb6tNm4zAIT60Fv64ShhxNrTvLaKE0Vqpk6CkiV4kwyO6Xu7qKIovJTRS/x20wTh+rF97vXkI4W2b2w+8=@vger.kernel.org X-Gm-Message-State: AOJu0YzAOqvkKc9eFnTjmtWxBx7nDOQ54Q0MO5gqNwUKhhxHtoSQnms+ kEYQeJnrzloX045GmN3JP+zQRfjb+chegsA67Cie3RkFO/1RRwlheCnTzP0OG5hk1+/3W6x4U+N W+7Qf8ziPBQ== X-Google-Smtp-Source: AGHT+IFjNcbVLRpKDzB1+cGidoQ6jru3UYvZTwpg+7RV/Z9c7270tYSK/s09toXvZdmZKCJeGDe+3MDNrRql X-Received: from pjbsl16.prod.google.com ([2002:a17:90b:2e10:b0:311:ff0f:6962]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5104:b0:311:ad7f:329c with SMTP id 98e67ed59e1d1-313f1ce5cacmr14167125a91.18.1750050952947; Sun, 15 Jun 2025 22:15:52 -0700 (PDT) Date: Sun, 15 Jun 2025 22:14:58 -0700 In-Reply-To: <20250616051500.1047173-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: <20250616051500.1047173-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc2.696.g1fc2a0284f-goog Message-ID: <20250616051500.1047173-14-irogers@google.com> Subject: [PATCH v3 13/15] perf tp_pmu: Add event APIs From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , John Garry , "Masami Hiramatsu (Google)" , Howard Chu , Weilin Wang , Thomas Richter , Andi Kleen , Tiezhu Yang , Gautam Menghani , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add event APIs for the tracepoint PMU allowing things like perf list to function using it. For perf list add the tracepoint format in the long description (shown with -v). Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 7 +++ tools/perf/util/tp_pmu.c | 114 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/tp_pmu.h | 7 +++ 3 files changed, 128 insertions(+) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index c0c12880146a..2b7671d5bbb4 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -23,6 +23,7 @@ #include "hwmon_pmu.h" #include "pmus.h" #include "tool_pmu.h" +#include "tp_pmu.h" #include #include #include "parse-events.h" @@ -1976,6 +1977,8 @@ bool perf_pmu__have_event(struct perf_pmu *pmu, const= char *name) return false; if (perf_pmu__is_tool(pmu) && tool_pmu__skip_event(name)) return false; + if (perf_pmu__is_tracepoint(pmu)) + return tp_pmu__have_event(pmu, name); if (perf_pmu__is_hwmon(pmu)) return hwmon_pmu__have_event(pmu, name); if (perf_pmu__find_alias(pmu, name, /*load=3D*/ true) !=3D NULL) @@ -1989,6 +1992,8 @@ size_t perf_pmu__num_events(struct perf_pmu *pmu) { size_t nr; =20 + if (perf_pmu__is_tracepoint(pmu)) + return tp_pmu__num_events(pmu); if (perf_pmu__is_hwmon(pmu)) return hwmon_pmu__num_events(pmu); =20 @@ -2057,6 +2062,8 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bo= ol skip_duplicate_pmus, struct hashmap_entry *entry; size_t bkt; =20 + if (perf_pmu__is_tracepoint(pmu)) + return tp_pmu__for_each_event(pmu, state, cb); if (perf_pmu__is_hwmon(pmu)) return hwmon_pmu__for_each_event(pmu, state, cb); =20 diff --git a/tools/perf/util/tp_pmu.c b/tools/perf/util/tp_pmu.c index fd83164f8763..9d68a1da17f6 100644 --- a/tools/perf/util/tp_pmu.c +++ b/tools/perf/util/tp_pmu.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) #include "tp_pmu.h" +#include "pmus.h" #include #include #include @@ -93,3 +94,116 @@ int tp_pmu__for_each_tp_sys(void *state, tp_sys_callbac= k cb) close(events_dir.dirfd); return ret; } + +bool perf_pmu__is_tracepoint(const struct perf_pmu *pmu) +{ + return pmu->type =3D=3D PERF_TYPE_TRACEPOINT; +} + +struct for_each_event_args { + void *state; + pmu_event_callback cb; + const struct perf_pmu *pmu; +}; + +static int for_each_event_cb(void *state, const char *sys_name, const char= *evt_name) +{ + struct for_each_event_args *args =3D state; + char name[2 * FILENAME_MAX + 2]; + /* 16 possible hex digits and 22 other characters and \0. */ + char encoding[16 + 22]; + char *format =3D NULL; + size_t format_size; + struct pmu_event_info info =3D { + .pmu =3D args->pmu, + .pmu_name =3D args->pmu->name, + .event_type_desc =3D "Tracepoint event", + }; + char *tp_dir =3D get_events_file(sys_name); + char path[PATH_MAX]; + int id, err; + + if (!tp_dir) + return -1; + + scnprintf(path, sizeof(path), "%s/%s/id", tp_dir, evt_name); + err =3D filename__read_int(path, &id); + if (err =3D=3D 0) { + snprintf(encoding, sizeof(encoding), "tracepoint/config=3D0x%x/", id); + info.encoding_desc =3D encoding; + } + + scnprintf(path, sizeof(path), "%s/%s/format", tp_dir, evt_name); + put_events_file(tp_dir); + err =3D filename__read_str(path, &format, &format_size); + if (err =3D=3D 0) { + info.long_desc =3D format; + for (size_t i =3D 0 ; i < format_size; i++) { + /* Swap tabs to spaces due to some rendering issues. */ + if (format[i] =3D=3D '\t') + format[i] =3D ' '; + } + } + snprintf(name, sizeof(name), "%s:%s", sys_name, evt_name); + info.name =3D name; + err =3D args->cb(args->state, &info); + free(format); + return err; +} + +static int for_each_event_sys_cb(void *state, const char *sys_name) +{ + return tp_pmu__for_each_tp_event(sys_name, state, for_each_event_cb); +} + +int tp_pmu__for_each_event(struct perf_pmu *pmu, void *state, pmu_event_ca= llback cb) +{ + struct for_each_event_args args =3D { + .state =3D state, + .cb =3D cb, + .pmu =3D pmu, + }; + + return tp_pmu__for_each_tp_sys(&args, for_each_event_sys_cb); +} + +static int num_events_cb(void *state, const char *sys_name __maybe_unused, + const char *evt_name __maybe_unused) +{ + size_t *count =3D state; + + (*count)++; + return 0; +} + +static int num_events_sys_cb(void *state, const char *sys_name) +{ + return tp_pmu__for_each_tp_event(sys_name, state, num_events_cb); +} + +size_t tp_pmu__num_events(struct perf_pmu *pmu __maybe_unused) +{ + size_t count =3D 0; + + tp_pmu__for_each_tp_sys(&count, num_events_sys_cb); + return count; +} + +bool tp_pmu__have_event(struct perf_pmu *pmu __maybe_unused, const char *n= ame) +{ + char *dup_name, *colon; + int id; + + if (strchr(name, ':') =3D=3D NULL) + return false; + + dup_name =3D strdup(name); + if (!dup_name) + return false; + + colon =3D strchr(dup_name, ':'); + *colon =3D '\0'; + id =3D tp_pmu__id(dup_name, colon + 1); + free(dup_name); + return id >=3D 0; +} diff --git a/tools/perf/util/tp_pmu.h b/tools/perf/util/tp_pmu.h index 49537303bd73..30456bd6943d 100644 --- a/tools/perf/util/tp_pmu.h +++ b/tools/perf/util/tp_pmu.h @@ -2,6 +2,8 @@ #ifndef __TP_PMU_H #define __TP_PMU_H =20 +#include "pmu.h" + typedef int (*tp_sys_callback)(void *state, const char *sys_name); typedef int (*tp_event_callback)(void *state, const char *sys_name, const = char *evt_name); =20 @@ -9,4 +11,9 @@ int tp_pmu__id(const char *sys, const char *name); int tp_pmu__for_each_tp_event(const char *sys, void *state, tp_event_callb= ack cb); int tp_pmu__for_each_tp_sys(void *state, tp_sys_callback cb); =20 +bool perf_pmu__is_tracepoint(const struct perf_pmu *pmu); +int tp_pmu__for_each_event(struct perf_pmu *pmu, void *state, pmu_event_ca= llback cb); +size_t tp_pmu__num_events(struct perf_pmu *pmu); +bool tp_pmu__have_event(struct perf_pmu *pmu, const char *name); + #endif /* __TP_PMU_H */ --=20 2.50.0.rc2.696.g1fc2a0284f-goog