From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DE2CE6FE47 for ; Sat, 7 Sep 2024 05:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QKvA61WwO8WManIDEry3xBPvYjCmgFaen6iyvj8dmS0=; b=lpNXG1g63UkTVTYj4Ojka+GI3k nTOtwUMyuXq8oNjVYKypK2AcaigxZ/qSsF0doq66Q3VTPuQ0AhgY5jzf/KPFtZuPq8pTe6vk3LHFZ tsB9XCD6aELTsr/G8paspr77uJRWFfKORg9kyVIkZplndvnT9wIZj7WDWVSl7qCK0voBUTE132jzV M9SiSSNL/JBF30a0KyM/HvAyEeLdOguuLKTd4mdkh7RYy5kghII8sJSwAY+R0h/I3QBnHtV3Ske5U MZXKNA9NSkJH0iZBuOO3y1FlAPuyS2E//TifTUTgQW0QWdSAYRRtpAANfjFeNO+HcXmA3Udy9u7T/ P6aRiRRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smnle-0000000ENQI-34RV; Sat, 07 Sep 2024 05:13:50 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smngp-0000000EMFX-3G1W for linux-arm-kernel@lists.infradead.org; Sat, 07 Sep 2024 05:08:53 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e0353b731b8so6431921276.2 for ; Fri, 06 Sep 2024 22:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725685730; x=1726290530; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=QKvA61WwO8WManIDEry3xBPvYjCmgFaen6iyvj8dmS0=; b=IGxw/potjtXMmGewuTOpAaiM/ZSULzOMOFcCkZBO+O4+9aGnzs7cx7dLTeDRKzjuD4 tpoGNpGZ+c0m7m+6H/fkoUjY3B/bB8Rzh7cQKKHX7FPnYm6dT0Pk7aVeZsm4zMbZevKY QWGuqwsRvOnAwf3NWI8wDXHud+Z9J/1w9oVJFzZAFwSa2X6oJ6UL5u6IUtS6xFGdImar Qrn4+8Zx1WiAmPAWXHf7Cpkw0wwjXMCXg06AWAuhUcbiZxp4KFdwvcUZ2QC+5F1/pXBs gSRbwweouhVeKfEqRZQfszEc+TB05+Fp9A7qFIVU8uFD3WVTOQh3qGt30WTU7Y7nBShH 6QNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725685730; x=1726290530; h=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=QKvA61WwO8WManIDEry3xBPvYjCmgFaen6iyvj8dmS0=; b=ChMX50tOrQCdkZ05sor778z9ifloDh00MjL0HP3+5yIKdPGVowtj3v6UVV1osiM9wA CoJ5EtHZNW1YMrWs8PoEaC/ZQ1JSf6W3MVxAleDDXB3caInojG9MtqzENs9iml6QsUuV vo33Kqv8oDAX7q2WQU2uKthF64ZflliWWmmqVr/PwrGhNKdcu8Dli23z3AkgVvqoefco yN7BBL3SA/ZJYEDp5OQCYU/b8r2nrPtY7fbqLP0vZbLRY1yrq8nlsjiU9cJPY37qBkzJ AEL6yhXr0G0BdOLpg5JPKBlcj/ThApyaOnmgQChfz0v2KXMuNtpl/N+UZiDoJ7GI4rpT LY6Q== X-Forwarded-Encrypted: i=1; AJvYcCXyCBHrqK9ppZtzbzV8ByQvig+mZAZpt7Kdb7rnoHTzJcspjpi/awGG1cZutI9psT2rg336S0iWSRmpMWDy26Qh@lists.infradead.org X-Gm-Message-State: AOJu0YyYYZ9VtlZc0ymRDeZ0Uz8DDatbEswGUELy7dewSPgrzdvsFDjL C+G8xza5oq5FrHx9hyEn+8uv5QBfEDCSvuGAn69knpSWSxiK09WF0GGHjdxv2sOGqBLiXLwklWA PhXLL+A== X-Google-Smtp-Source: AGHT+IF7UBKTi9sJI18dojLizpBg3DhTO/Azd5rIjyDI4e7nelFwAEZSFGGcydoCgyKhtL3urTmxhEGBxaKF X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:90e5:a813:c3d3:daed]) (user=irogers job=sendgmr) by 2002:a5b:6c6:0:b0:e1a:9a4d:a500 with SMTP id 3f1490d57ef6-e1d34a1461cmr7217276.11.1725685729619; Fri, 06 Sep 2024 22:08:49 -0700 (PDT) Date: Fri, 6 Sep 2024 22:08:19 -0700 In-Reply-To: <20240907050830.6752-1-irogers@google.com> Message-Id: <20240907050830.6752-5-irogers@google.com> Mime-Version: 1.0 References: <20240907050830.6752-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 04/15] perf pmu: To info add event_type_desc 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240906_220851_839024_E964EB5C X-CRM114-Status: GOOD ( 14.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org All PMU events are assumed to be "Kernel PMU event", however, this isn't true for fake PMUs and won't be true with the addition of more software PMUs. Make the PMU's type description name configurable - largely for printing callbacks. Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 1 + tools/perf/util/pmu.h | 1 + tools/perf/util/pmus.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 50e2e7abffab..72bfc321e4b3 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1857,6 +1857,7 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bool skip_duplicate_pmus, struct perf_pmu_alias *event; struct pmu_event_info info = { .pmu = pmu, + .event_type_desc = "Kernel PMU event", }; int ret = 0; struct strbuf sb; diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index d6f702e55a05..4397c48ad569 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -194,6 +194,7 @@ struct pmu_event_info { const char *encoding_desc; const char *topic; const char *pmu_name; + const char *event_type_desc; const char *str; bool deprecated; }; diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 864cbfa1f960..93e5c0435ee0 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -371,6 +371,7 @@ struct sevent { const char *encoding_desc; const char *topic; const char *pmu_name; + const char *event_type_desc; bool deprecated; }; @@ -444,6 +445,7 @@ static int perf_pmus__print_pmu_events__callback(void *vstate, COPY_STR(encoding_desc); COPY_STR(topic); COPY_STR(pmu_name); + COPY_STR(event_type_desc); #undef COPY_STR s->deprecated = info->deprecated; state->index++; @@ -498,7 +500,7 @@ void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *p aliases[j].alias, aliases[j].scale_unit, aliases[j].deprecated, - "Kernel PMU event", + aliases[j].event_type_desc, aliases[j].desc, aliases[j].long_desc, aliases[j].encoding_desc); @@ -511,6 +513,7 @@ void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *p zfree(&aliases[j].encoding_desc); zfree(&aliases[j].topic); zfree(&aliases[j].pmu_name); + zfree(&aliases[j].event_type_desc); } if (printed && pager_in_use()) printf("\n"); -- 2.46.0.469.g59c65b2a67-goog