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=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 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 74BBFC33C99 for ; Tue, 7 Jan 2020 09:14:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50F772080A for ; Tue, 7 Jan 2020 09:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727704AbgAGJOA (ORCPT ); Tue, 7 Jan 2020 04:14:00 -0500 Received: from lhrrgout.huawei.com ([185.176.76.210]:2231 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726327AbgAGJN7 (ORCPT ); Tue, 7 Jan 2020 04:13:59 -0500 Received: from lhreml707-cah.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id D28D1FC61E7209F280F5; Tue, 7 Jan 2020 09:13:57 +0000 (GMT) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by lhreml707-cah.china.huawei.com (10.201.108.48) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 7 Jan 2020 09:13:44 +0000 Received: from [127.0.0.1] (10.202.226.43) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 7 Jan 2020 09:13:44 +0000 From: John Garry Subject: Re: [PATCH] perf tools: Add arm64 version of get_cpuid() To: , , , , , , CC: , , , References: <1576245255-210926-1-git-send-email-john.garry@huawei.com> Message-ID: <1005f572-e32a-a90e-1572-c85a2f202fdf@huawei.com> Date: Tue, 7 Jan 2020 09:13:43 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 In-Reply-To: <1576245255-210926-1-git-send-email-john.garry@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.226.43] X-ClientProxiedBy: lhreml729-chm.china.huawei.com (10.201.108.80) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/12/2019 13:54, John Garry wrote: Hi Arnaldo, Do we need some reviews on this? Or was it missed/still catching up? Cheers, John > Add an arm64 version of get_cpuid(), which is used for various annotation > and headers - for example, I now get the CPUID in "perf report --header", > as shown in this snippet: > > # hostname : ubuntu > # os release : 5.5.0-rc1-dirty > # perf version : 5.5.rc1.gbf8a13dc9851 > # arch : aarch64 > # nrcpus online : 96 > # nrcpus avail : 96 > # cpuid : 0x00000000480fd010 > > Since much of the code to read the MIDR is already in get_cpuid_str(), > factor out this code. > > Signed-off-by: John Garry > > diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/util/header.c > index a32e4b72a98f..d730666ab95d 100644 > --- a/tools/perf/arch/arm64/util/header.c > +++ b/tools/perf/arch/arm64/util/header.c > @@ -1,8 +1,10 @@ > #include > #include > #include > +#include > #include > #include > +#include > #include "debug.h" > #include "header.h" > > @@ -12,26 +14,21 @@ > #define MIDR_VARIANT_SHIFT 20 > #define MIDR_VARIANT_MASK (0xf << MIDR_VARIANT_SHIFT) > > -char *get_cpuid_str(struct perf_pmu *pmu) > +static int _get_cpuid(char *buf, size_t sz, struct perf_cpu_map *cpus) > { > - char *buf = NULL; > - char path[PATH_MAX]; > const char *sysfs = sysfs__mountpoint(); > - int cpu; > u64 midr = 0; > - struct perf_cpu_map *cpus; > - FILE *file; > + int cpu; > > - if (!sysfs || !pmu || !pmu->cpus) > - return NULL; > + if (!sysfs || sz < MIDR_SIZE) > + return EINVAL; > > - buf = malloc(MIDR_SIZE); > - if (!buf) > - return NULL; > + cpus = perf_cpu_map__get(cpus); > > - /* read midr from list of cpus mapped to this pmu */ > - cpus = perf_cpu_map__get(pmu->cpus); > for (cpu = 0; cpu < perf_cpu_map__nr(cpus); cpu++) { > + char path[PATH_MAX]; > + FILE *file; > + > scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d"MIDR, > sysfs, cpus->map[cpu]); > > @@ -57,12 +54,48 @@ char *get_cpuid_str(struct perf_pmu *pmu) > break; > } > > - if (!midr) { > + perf_cpu_map__put(cpus); > + > + if (!midr) > + return EINVAL; > + > + return 0; > +} > + > +int get_cpuid(char *buf, size_t sz) > +{ > + struct perf_cpu_map *cpus = perf_cpu_map__new(NULL); > + int ret; > + > + if (!cpus) > + return EINVAL; > + > + ret = _get_cpuid(buf, sz, cpus); > + > + perf_cpu_map__put(cpus); > + > + return ret; > +} > + > +char *get_cpuid_str(struct perf_pmu *pmu) > +{ > + char *buf = NULL; > + int res; > + > + if (!pmu || !pmu->cpus) > + return NULL; > + > + buf = malloc(MIDR_SIZE); > + if (!buf) > + return NULL; > + > + /* read midr from list of cpus mapped to this pmu */ > + res = _get_cpuid(buf, MIDR_SIZE, pmu->cpus); > + if (res) { > pr_err("failed to get cpuid string for PMU %s\n", pmu->name); > free(buf); > buf = NULL; > } > > - perf_cpu_map__put(cpus); > return buf; > } >