From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 7D4BD1FAC4E for ; Sat, 28 Jun 2025 00:10:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751069405; cv=none; b=RyJjNa68exgf+3OzDSn2CUg5O6GnK3oCxwGumwLxdDdn+/nK2DO5skTX7Jr7cjaGHI5jex7Pyx4TOTGfrzPQ2FeuKroeQexXPkpN9Zqcod7j38gL+bXTw+wkL1Z/ek+xdGMuiZCItHQ8eVwah5dxQSRiG/LUBAB1UpQORdeqlpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751069405; c=relaxed/simple; bh=RZ/4wZ7BLS3RqD09YBHOjY7W3qZV5Jmx+MPGWahCs1s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=H4JiLYtlxsbd5TQYlpYZFoQFo0KkCIWlSm32mB9s3BPHIsuSUibaTXB1c2m4wOMW6gnw1CTdV8WtJ+sCAE6Mm1u8+JTTkMvnJnqUZB6NkukNvD3AqyhiFtM+xHObl6QHmsRcSpcTEznrQ990Adc5tHKenqwObJce4dDYf0ukb3I= 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=SVs0S+HT; arc=none smtp.client-ip=209.85.215.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="SVs0S+HT" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b34ca003f1cso356397a12.2 for ; Fri, 27 Jun 2025 17:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751069403; x=1751674203; 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=O5/KtDdH9KZtizmnT+G+DMzo0YjRxsCsauFrBz7enXg=; b=SVs0S+HT7EAgQjgmZOkr4S5E2BDAymqCdEViIbnPThRv7rPr0GLprz/vmlTCHqdjZR Oo1peA5Om6XYt4Wa714zvqbAMADL3vL4npBcKCmD/ifsuFWXfMhypCOXtLZN4Sjeaw81 A47phVdc//BH6nV5T1Yi6G2VHR9MUE7sCIOFfk3+ljASNe1TaEOMWB43dMPo+2k+k/oh 5vb9Uq15XyeOI4lnbgE186OBqDV5ADZ3+trGLnJzCSTIdQW+ay9sZygHpBI1MV8xtBlq e4Df4DbPZlCOL9o1Tkibu4j8xqpQSKRNijM7B2CloYPyhfXeqzSzfilRQ0ubSYTAhDzw weyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751069403; x=1751674203; 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=O5/KtDdH9KZtizmnT+G+DMzo0YjRxsCsauFrBz7enXg=; b=Tc1WLcPv8ssSp2ieczBCyfnrOsKgLvHfLadwfZvR1cAcm1+uDIyEi+TpoxEoxS1BWh 5Sc3oeewN35LAwznR0MSiIELJ1QrelscZDdNCjMxmemQ9qQ8ce6HVm9jyk5qOyg4GDF7 hXpi0f0PbMe6w4U6+oayn3GyNX+oSFwoXBWVM2DvZy5BCWeszGRmceU39cL92yfZSkEd vnL2sNVjYunZsxveUy1vTU0gwFd68G5ZCcxlJeZDbp3pd2GQwz/RkajCKu+99/cVdMVC TwwQWTlkcFberQ6cTZW1oUW2mS4+MNLAcXK0MRQnxskActJVkAosUvw1QP2AFP49b3LK kfog== X-Forwarded-Encrypted: i=1; AJvYcCWpwjQ0daSMt0hU5SsTS9FYwxHkbrS7Z42QVB8bdbPAC8pfirY7FMgertgLxbkpCI4DIzARMAUPNuylDJYlDuz0@vger.kernel.org X-Gm-Message-State: AOJu0Yws+NUTBFhNPw6yJCdM9f0UUfPwW+5djWmnoIAQ7CooOusAsJs2 pIe3HwI5GDJvAWMzIEIWZS5Vxitr0DMSczlQ8vv8w6yvPIQBUGOzkMH1fEXzRufuXNtTwjx5Rfu pRBQRnYRCfg== X-Google-Smtp-Source: AGHT+IFfaWErwEWkdM77xhMbB2SsCw2H2bFaIgieGbl7n4DQyfnQbUFtF2Dc7oBV1oF534nb3xW8gEFjX3I0 X-Received: from pfwp48.prod.google.com ([2002:a05:6a00:26f0:b0:748:e8fc:e9f0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:50e:b0:220:396b:9938 with SMTP id adf61e73a8af0-220a14149b7mr7595941637.18.1751069402838; Fri, 27 Jun 2025 17:10:02 -0700 (PDT) Date: Fri, 27 Jun 2025 17:09:27 -0700 In-Reply-To: <20250628000929.230406-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250628000929.230406-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250628000929.230406-14-irogers@google.com> Subject: [PATCH v4 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-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 b09b2ea2407a..dc05233e8232 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -24,6 +24,7 @@ #include "hwmon_pmu.h" #include "pmus.h" #include "tool_pmu.h" +#include "tp_pmu.h" #include #include #include "parse-events.h" @@ -1983,6 +1984,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__is_drm(pmu)) @@ -1998,6 +2001,8 @@ size_t perf_pmu__num_events(struct perf_pmu *pmu) { size_t nr; + if (perf_pmu__is_tracepoint(pmu)) + return tp_pmu__num_events(pmu); if (perf_pmu__is_hwmon(pmu)) return hwmon_pmu__num_events(pmu); if (perf_pmu__is_drm(pmu)) @@ -2068,6 +2073,8 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bool skip_duplicate_pmus, struct hashmap_entry *entry; size_t bkt; + 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); if (perf_pmu__is_drm(pmu)) 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_callback cb) close(events_dir.dirfd); return ret; } + +bool perf_pmu__is_tracepoint(const struct perf_pmu *pmu) +{ + return pmu->type == 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 = state; + char name[2 * FILENAME_MAX + 2]; + /* 16 possible hex digits and 22 other characters and \0. */ + char encoding[16 + 22]; + char *format = NULL; + size_t format_size; + struct pmu_event_info info = { + .pmu = args->pmu, + .pmu_name = args->pmu->name, + .event_type_desc = "Tracepoint event", + }; + char *tp_dir = 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 = filename__read_int(path, &id); + if (err == 0) { + snprintf(encoding, sizeof(encoding), "tracepoint/config=0x%x/", id); + info.encoding_desc = encoding; + } + + scnprintf(path, sizeof(path), "%s/%s/format", tp_dir, evt_name); + put_events_file(tp_dir); + err = filename__read_str(path, &format, &format_size); + if (err == 0) { + info.long_desc = format; + for (size_t i = 0 ; i < format_size; i++) { + /* Swap tabs to spaces due to some rendering issues. */ + if (format[i] == '\t') + format[i] = ' '; + } + } + snprintf(name, sizeof(name), "%s:%s", sys_name, evt_name); + info.name = name; + err = 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_callback cb) +{ + struct for_each_event_args args = { + .state = state, + .cb = cb, + .pmu = 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 = 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 = 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 *name) +{ + char *dup_name, *colon; + int id; + + if (strchr(name, ':') == NULL) + return false; + + dup_name = strdup(name); + if (!dup_name) + return false; + + colon = strchr(dup_name, ':'); + *colon = '\0'; + id = tp_pmu__id(dup_name, colon + 1); + free(dup_name); + return id >= 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 +#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); @@ -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_callback cb); int tp_pmu__for_each_tp_sys(void *state, tp_sys_callback cb); +bool perf_pmu__is_tracepoint(const struct perf_pmu *pmu); +int tp_pmu__for_each_event(struct perf_pmu *pmu, void *state, pmu_event_callback 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 */ -- 2.50.0.727.gbf7dc18ff4-goog