Received: by 2002:a05:7412:1703:b0:e2:908c:2ebd with SMTP id dm3csp828093rdb; Fri, 25 Aug 2023 02:14:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGibAikXenwWo3x8TvCRdQ9+CEJ3OqNEhxkmXp1y4/8ggvM+7Bcw/iKrVgGuavoeGmGXcUK X-Received: by 2002:a05:6a20:8f16:b0:14c:74ca:6643 with SMTP id b22-20020a056a208f1600b0014c74ca6643mr1394109pzk.10.1692954871057; Fri, 25 Aug 2023 02:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692954871; cv=none; d=google.com; s=arc-20160816; b=NxqyeJsEYbcC8k6d+fOKobKYwcyASxCMlOLR7bN+mBh8i0hXV5KHw8tO1sUWoMIopz 2qIxyCl5O+7RXe7sr5kth4yVRPg/858v2aiUjHZsZ5sswqW8rW6qyxtiuOoY6cQ8kFUC PnYpZRiaCqZJFsHQTVWcaxyszdnQr+U1GhvF5DQqkAK4QJHHqawFO+bJ6waCNEDwhaiv UgYoxMf2BAEn+6tGlotlz1aX3V99OoOw3vnc1wf3JioUI9NNUrfaOOJU8Li5vT5eUyld +k6oBBjXkQm+C7dIFOOYIlUFBRstMculUeJcybt/DkzU76CYOOXJ4WQ6X3CjLYbNAQ2y QipQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=S9fiOtw0vHdZBRfaqQf1E8dJaGHuryoJRUAjurNTmMc=; fh=er152ULeUTANSkQmvvQSqDIVG4zbnY42y0+JWj/P1q8=; b=MQX7R5a4+YuMu44w8CKZRuEj0/vs4+89Ovx13Df17iRBGFMrNw64hBrmsi39BU4wpu htrsJQUMIDJqF78bLaVGYkLQ/ebJQFSS0i2CDn4C0btlscWLC0RuhgUsHFKCuV1iAvX8 Bf7+mjqy3ZH/LEB/yzcEx5QJTcJf1Oal9LVA+R0tUmosAUXUDQ70jiNM5nEQ0krljgFh DMTiqnTSqsA4TRDAAVsrwTILAF3QzjiAA4Eu1PscTFKkgLnZqapbmycg07rBqSXl2aip vwMrsPRwM9RNqCENVvouXOa+yeFeeUUtDQ5hZgCaKyHWsvpEvZ7j5aGLAPWGVz0siwCV NDIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cq17-20020a056a00331100b00687a1406b9bsi1457939pfb.30.2023.08.25.02.14.16; Fri, 25 Aug 2023 02:14:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243754AbjHYIkc (ORCPT + 99 others); Fri, 25 Aug 2023 04:40:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243824AbjHYIkN (ORCPT ); Fri, 25 Aug 2023 04:40:13 -0400 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5FE61FD4; Fri, 25 Aug 2023 01:40:09 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VqWZWZJ_1692952804; Received: from 30.221.145.196(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VqWZWZJ_1692952804) by smtp.aliyun-inc.com; Fri, 25 Aug 2023 16:40:06 +0800 Message-ID: <27446554-54dd-51f9-c3e9-e3aa225d8380@linux.alibaba.com> Date: Fri, 25 Aug 2023 16:40:03 +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: Robin Murphy , John Garry , Ian Rogers Cc: 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 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2023/8/24 下午11:05, Robin Murphy 写道: > On 21/08/2023 9: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. > > I wonder is there any possibility of supporting multiple values as a JSON array, rather than a single delimited string? Otherwise, if we're putting restrictions on what characters a driver can expose as an identifier, then I think that really wants explicitly documenting. AFAICT there's currently not even any documentation of the de-facto ABI that it's expected to be a free-form string rather than completely arbitrary binary data. > I'm sorry I almost missed this message, as it was in my spam folder. If we put multiple values as an array, its parsing in jevent.py will become complicated. I agree that we need to document the character restrictions for driver identifier composition. Both Unit and Compat have the same problem, so certain characters need to be restricted in the identifiers and names of drivers. However, it seems that there is no such document. Thanks, Jing > Thanks, > Robin. > >> 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) >> +{ >> +    char *tmp = NULL, *tok, *str; >> +    bool res; >> +    int n; >> + >> +    /* >> +     * 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)) { >> +            res = true; >> +            goto out; >> +        } >> +    } >> +    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);