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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable 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 A1495C31E49 for ; Sun, 16 Jun 2019 09:58:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 797092173C for ; Sun, 16 Jun 2019 09:58:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hGXF4ZkC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 797092173C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=F+KX+1i5gt3u7IUPqrW0tFqGhNiBt13nsREzCB42IeE=; b=hGXF4ZkCGJC9hv 5lFEB7eIlu8lssXM7Vb7DT7tCfjHuXMH6xIGbp1PnMcCgPb3MNzY7q6bIDbTMeRXmnV745OAr16Nc 3SEnYX9k8HaL5KQMvidVDqJdVV5TkbSx9503d+GWNAn+OH3Cr2GR9jYVHjTHGFAbvG5dO3Aa8Uz9q nNcb1LuYBGplEYD0jjGU3d9ANF3l8kgNfPQ/Er9hK+tViNcmKtH6neQW8Zz/0ZB0w9ppSijRfacL/ NKFr/k4ywu2+QwcIMZO19QggWdLkQ/klhp7CwobVC8z2tVMfC+lcFY4un9RpPTeWSN0KP9Nn2h/c+ 8Bkd+PcpqCVyMH693ivg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hcRw9-0003Bl-Q5; Sun, 16 Jun 2019 09:58:57 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hcRw7-0003BE-3T for linux-arm-kernel@lists.infradead.org; Sun, 16 Jun 2019 09:58:56 +0000 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39D303084034; Sun, 16 Jun 2019 09:58:53 +0000 (UTC) Received: from krava (ovpn-204-53.brq.redhat.com [10.40.204.53]) by smtp.corp.redhat.com (Postfix) with SMTP id 6BD2C6AD2F; Sun, 16 Jun 2019 09:58:45 +0000 (UTC) Date: Sun, 16 Jun 2019 11:58:44 +0200 From: Jiri Olsa To: John Garry Subject: Re: [PATCH v2 2/5] perf pmu: Support more complex PMU event aliasing Message-ID: <20190616095844.GC2500@krava> References: <1560521283-73314-1-git-send-email-john.garry@huawei.com> <1560521283-73314-3-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1560521283-73314-3-git-send-email-john.garry@huawei.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Sun, 16 Jun 2019 09:58:53 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190616_025855_187382_37CD9A7F X-CRM114-Status: GOOD ( 22.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, brueckner@linux.ibm.com, mathieu.poirier@linaro.org, peterz@infradead.org, tmricht@linux.ibm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, acme@kernel.org, linuxarm@huawei.com, zhangshaokun@hisilicon.com, alexander.shishkin@linux.intel.com, mingo@redhat.com, namhyung@kernel.org, ben@decadent.org.uk, linux-arm-kernel@lists.infradead.org, kan.liang@linux.intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 14, 2019 at 10:08:00PM +0800, John Garry wrote: > The jevent "Unit" field is used for uncore PMU alias definition. > > The form uncore_pmu_example_X is supported, where "X" is a wildcard, > to support multiple instances of the same PMU in a system. > > Unfortunately this format not suitable for all uncore PMUs; take the Hisi > DDRC uncore PMU for example, where the name is in the form > hisi_scclX_ddrcY. > > For the current jevent parsing, we would be required to hardcode an uncore > alias translation for each possible value of X. This is not scalable. > > Instead, add support for "Unit" field in the form "hisi_sccl,ddrc", where > we can match by hisi_scclX and ddrcY. Tokens in Unit field are > delimited by ','. > > Signed-off-by: John Garry > --- > tools/perf/util/pmu.c | 39 ++++++++++++++++++++++++++++++++++----- > 1 file changed, 34 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c > index 7e7299fee550..bc71c60589b5 100644 > --- a/tools/perf/util/pmu.c > +++ b/tools/perf/util/pmu.c > @@ -700,6 +700,39 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu) > return map; > } > > +static bool pmu_uncore_alias_match(const char *pmu_name, const char *name) > +{ > + char *tmp, *tok, *str; > + bool res; > + > + str = strdup(pmu_name); > + if (!str) > + return false; > + > + /* > + * uncore alias may be from different PMU with common > + * prefix or matching tokens. > + */ > + tok = strtok_r(str, ",", &tmp); > + if (strncmp(pmu_name, tok, strlen(tok))) { if tok is NULL in here we crash > + res = false; > + goto out; > + } > + > + for (; tok; name += strlen(tok), tok = strtok_r(NULL, ",", &tmp)) { why is name shifted in here? jirka > + name = strstr(name, tok); > + if (!name) { > + res = false; > + goto out; > + } > + } > + > + res = true; > +out: > + free(str); > + return res; > +} > + > /* > * From the pmu_events_map, find the table of PMU events that corresponds > * to the current running CPU. Then, add all PMU events from that table > @@ -730,12 +763,8 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) > break; > } > > - /* > - * uncore alias may be from different PMU > - * with common prefix > - */ > if (pmu_is_uncore(name) && > - !strncmp(pname, name, strlen(pname))) > + pmu_uncore_alias_match(pname, name)) > goto new_alias; > > if (strcmp(pname, name)) > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel