From: Shaokun Zhang <zhangshaokun@hisilicon.com>
To: John Garry <john.garry@huawei.com>, <peterz@infradead.org>,
<mingo@redhat.com>, <acme@kernel.org>, <mark.rutland@arm.com>,
<alexander.shishkin@linux.intel.com>, <jolsa@redhat.com>,
<namhyung@kernel.org>
Cc: will@kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com
Subject: Re: [PATCH] perf tools: Add arm64 version of get_cpuid()
Date: Wed, 12 Feb 2020 17:30:56 +0800 [thread overview]
Message-ID: <4ccf4455-b33d-441b-50ed-28211dd87c7c@hisilicon.com> (raw)
In-Reply-To: <1576245255-210926-1-git-send-email-john.garry@huawei.com>
Hi John,
I tested this patch on my new ARM64 Kunpeng 920 server.
[root@node1 zsk]# ./perf --version
perf version 5.6.rc1.g2cdb955b7252
Both perf list and perf stat can work.
Tested-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Thanks,
Shaokun
On 2019/12/13 21:54, John Garry wrote:
> 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 <john.garry@huawei.com>
>
> 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 <stdio.h>
> #include <stdlib.h>
> #include <perf/cpumap.h>
> +#include <util/cpumap.h>
> #include <internal/cpumap.h>
> #include <api/fs/fs.h>
> +#include <errno.h>
> #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;
> }
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-12 9:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 13:54 [PATCH] perf tools: Add arm64 version of get_cpuid() John Garry
2020-01-07 9:13 ` John Garry
2020-02-12 13:40 ` Arnaldo Carvalho de Melo
2020-02-12 15:49 ` John Garry
2020-02-12 9:30 ` Shaokun Zhang [this message]
2020-02-12 13:35 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ccf4455-b33d-441b-50ed-28211dd87c7c@hisilicon.com \
--to=zhangshaokun@hisilicon.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).