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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35891C3815B for ; Fri, 17 Apr 2020 10:45:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17F9B221EC for ; Fri, 17 Apr 2020 10:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729922AbgDQKpb (ORCPT ); Fri, 17 Apr 2020 06:45:31 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:36024 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729852AbgDQKp3 (ORCPT ); Fri, 17 Apr 2020 06:45:29 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 99262AD9048FCD38B932; Fri, 17 Apr 2020 18:45:26 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Fri, 17 Apr 2020 18:45:20 +0800 From: John Garry To: , , , , , , , CC: , , , , , , , , John Garry Subject: [RFC PATCH v2 08/13] perf pmu: Add pmu_add_sys_aliases() Date: Fri, 17 Apr 2020 18:41:19 +0800 Message-ID: <1587120084-18990-9-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1587120084-18990-1-git-send-email-john.garry@huawei.com> References: <1587120084-18990-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add pmu_add_sys_aliases() to add system PMU events aliases. For adding system PMU events, we iterate through all the events per SoC event table in pmu_sys_event_tables[]. Matches must satisfy both: - PMU identifier matches event "compat" value - like uncore event matching, the event "Unit" member must match; this match under return value of pmu_uncore_alias_match() (maybe rename that function?) Signed-off-by: John Garry --- tools/perf/util/pmu.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/pmu.h | 5 ++++ 2 files changed, 84 insertions(+) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 6a67c6a28d08..2f38465e8a73 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -827,6 +827,84 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) pmu_add_cpu_aliases_map(head, pmu, map); } +void pmu_for_each_sys_event(struct perf_pmu *pmu, pmu_sys_event_iter_fn fn, + void *data) +{ + struct pmu_event *pe; + int i = 0; + + if (!pmu->id) + return; + + while (1) { + struct pmu_sys_events *event_table; + int j = 0; + + event_table = &pmu_sys_event_tables[i++]; + + if (!event_table->table) + break; + + while (1) { + int ret; + + pe = &event_table->table[j++]; + + if (!pe->name && !pe->metric_group && !pe->metric_name) + break; + + ret = fn(pmu, pe, data); + if (ret) + break; + } + } +} + +struct pmu_sys_event_iter_data { + struct list_head *head; +}; + +static int pmu_add_sys_aliases_iter_fn(struct perf_pmu *pmu, + struct pmu_event *pe, void *data) +{ + struct pmu_sys_event_iter_data *idata = data; + + if (!pe->name) { + if (pe->metric_group || pe->metric_name) + return 0; + return -EINVAL; + } + + if (!pe->compat || !pe->pmu) + return 0; + + if (!strcmp(pmu->id, pe->compat) && + pmu_uncore_alias_match(pe->pmu, pmu->name)) { + __perf_pmu__new_alias(idata->head, NULL, + (char *)pe->name, + (char *)pe->desc, + (char *)pe->event, + (char *)pe->long_desc, + (char *)pe->topic, + (char *)pe->unit, + (char *)pe->perpkg, + (char *)pe->metric_expr, + (char *)pe->metric_name, + (char *)pe->deprecated); + } + + return 0; +} + +static void pmu_add_sys_aliases(struct list_head *head, struct perf_pmu *pmu) +{ + struct pmu_sys_event_iter_data idata = { + .head = head, + }; + + pmu_for_each_sys_event(pmu, pmu_add_sys_aliases_iter_fn, &idata); +} + struct perf_event_attr * __weak perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) { @@ -882,6 +960,7 @@ static struct perf_pmu *pmu_lookup(const char *name) pmu->id = pmu_id(name); pmu->max_precise = pmu_max_precise(name); pmu_add_cpu_aliases(&aliases, pmu); + pmu_add_sys_aliases(&aliases, pmu); INIT_LIST_HEAD(&pmu->format); INIT_LIST_HEAD(&pmu->aliases); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 62ebca9481fe..e4bc9d192236 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -106,6 +106,11 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu, struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu); bool pmu_uncore_alias_match(const char *pmu_name, const char *name); +typedef int (*pmu_sys_event_iter_fn)(struct perf_pmu *, struct pmu_event *pe, + void *data); + +void pmu_for_each_sys_event(struct perf_pmu *pmu, pmu_sys_event_iter_fn fn, + void *data); int perf_pmu__convert_scale(const char *scale, char **end, double *sval); #endif /* __PMU_H */ -- 2.16.4