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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62072C71133 for ; Fri, 25 Aug 2023 06:13:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241613AbjHYGNA (ORCPT ); Fri, 25 Aug 2023 02:13:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241996AbjHYGMq (ORCPT ); Fri, 25 Aug 2023 02:12:46 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CB0E2120; Thu, 24 Aug 2023 23:12:32 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VqW2Dho_1692943945; Received: from 30.221.145.196(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VqW2Dho_1692943945) by smtp.aliyun-inc.com; Fri, 25 Aug 2023 14:12:27 +0800 Message-ID: <8f319bc9-8740-627e-09c7-934c30a053bc@linux.alibaba.com> Date: Fri, 25 Aug 2023 14:12:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH v7 1/8] perf pmu: "Compat" supports matching multiple identifiers To: Ian Rogers Cc: John Garry , Will Deacon , James Clark , Arnaldo Carvalho de Melo , Mark Rutland , Mike Leach , Leo Yan , Namhyung Kim , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, Zhuo Song , Shuai Xue References: <1692606977-92009-1-git-send-email-renyu.zj@linux.alibaba.com> <1692606977-92009-2-git-send-email-renyu.zj@linux.alibaba.com> From: Jing Zhang In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2023/8/25 下午12:11, Ian Rogers 写道: > On Mon, Aug 21, 2023 at 1:36 AM Jing Zhang wrote: >> >> The jevent "Compat" is used for uncore PMU alias or metric definitions. >> >> The same PMU driver has different PMU identifiers due to different >> hardware versions and types, but they may have some common PMU event. >> Since a Compat value can only match one identifier, when adding the >> same event alias to PMUs with different identifiers, each identifier >> needs to be defined once, which is not streamlined enough. >> >> So let "Compat" supports matching multiple identifiers for uncore PMU >> alias. For example, the Compat value {43401;436*} can match the PMU >> identifier "43401", that is, CMN600_r0p0, and the PMU identifier with >> the prefix "436", that is, all CMN650, where "*" is a wildcard. >> Tokens in Unit field are delimited by ';' with no spaces. >> >> Signed-off-by: Jing Zhang >> Reviewed-by: John Garry >> --- >> tools/perf/util/pmu.c | 33 +++++++++++++++++++++++++++++++-- >> tools/perf/util/pmu.h | 1 + >> 2 files changed, 32 insertions(+), 2 deletions(-) >> >> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c >> index ad209c8..6402423 100644 >> --- a/tools/perf/util/pmu.c >> +++ b/tools/perf/util/pmu.c >> @@ -776,6 +776,35 @@ static bool pmu_uncore_alias_match(const char *pmu_name, const char *name) >> return res; >> } >> >> +bool pmu_uncore_identifier_match(const char *id, const char *compat) > > static? > This function needs to be called in utils/metricgroup.c, so it cannot be static. >> +{ >> + char *tmp = NULL, *tok, *str; >> + bool res; > > Initialize to false to avoid the goto. > ok，no problem. >> + int n; > > Move into the scope of the for loop, to reduce the scope. > ok >> + >> + /* >> + * The strdup() call is necessary here because "compat" is a const str* >> + * type and cannot be used as an argument to strtok_r(). >> + */ >> + str = strdup(compat); >> + if (!str) >> + return false; >> + >> + tok = strtok_r(str, ";", &tmp); >> + for (; tok; tok = strtok_r(NULL, ";", &tmp)) { >> + n = strlen(tok); >> + if ((tok[n - 1] == '*' && !strncmp(id, tok, n - 1)) || >> + !strcmp(id, tok)) { > > We use fnmatch for a similar check: > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/pmu.c?h=perf-tools-next#n1982 > ok >> + res = true; >> + goto out; > > With "res=false;" above this can just be a regular break. > ok, thank you! > Thanks, > Ian > >> + } >> + } >> + res = false; >> +out: >> + free(str); >> + return res; >> +} >> + >> struct pmu_add_cpu_aliases_map_data { >> struct list_head *head; >> const char *name; >> @@ -847,8 +876,8 @@ static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe, >> if (!pe->compat || !pe->pmu) >> return 0; >> >> - if (!strcmp(pmu->id, pe->compat) && >> - pmu_uncore_alias_match(pe->pmu, pmu->name)) { >> + if (pmu_uncore_alias_match(pe->pmu, pmu->name) && >> + pmu_uncore_identifier_match(pmu->id, pe->compat)) { >> __perf_pmu__new_alias(idata->head, -1, >> (char *)pe->name, >> (char *)pe->desc, >> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h >> index b9a02de..9d4385d 100644 >> --- a/tools/perf/util/pmu.h >> +++ b/tools/perf/util/pmu.h >> @@ -241,6 +241,7 @@ void pmu_add_cpu_aliases_table(struct list_head *head, struct perf_pmu *pmu, >> char *perf_pmu__getcpuid(struct perf_pmu *pmu); >> const struct pmu_events_table *pmu_events_table__find(void); >> const struct pmu_metrics_table *pmu_metrics_table__find(void); >> +bool pmu_uncore_identifier_match(const char *id, const char *compat); >> void perf_pmu_free_alias(struct perf_pmu_alias *alias); >> >> int perf_pmu__convert_scale(const char *scale, char **end, double *sval); >> -- >> 1.8.3.1 >>