From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 2/4] perf tools arm64: Add support for get_cpuid_str function.
Date: Wed, 11 Oct 2017 13:13:32 +0100 [thread overview]
Message-ID: <20171011121332.GA11106@arm.com> (raw)
In-Reply-To: <20170824120349.2323-3-ganapatrao.kulkarni@cavium.com>
On Thu, Aug 24, 2017 at 05:33:47PM +0530, Ganapatrao Kulkarni wrote:
> function get_cpuid_str returns MIDR string of the first online
> cpu from the range of cpus associated with the pmu core device.
>
> Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
> ---
> tools/perf/arch/arm64/util/Build | 1 +
> tools/perf/arch/arm64/util/header.c | 60 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 61 insertions(+)
> create mode 100644 tools/perf/arch/arm64/util/header.c
>
> diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/Build
> index cef6fb3..b1ab72d 100644
> --- a/tools/perf/arch/arm64/util/Build
> +++ b/tools/perf/arch/arm64/util/Build
> @@ -1,3 +1,4 @@
> +libperf-y += header.o
> libperf-$(CONFIG_DWARF) += dwarf-regs.o
> libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
>
> diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/util/header.c
> new file mode 100644
> index 0000000..f02a32e
> --- /dev/null
> +++ b/tools/perf/arch/arm64/util/header.c
> @@ -0,0 +1,60 @@
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <api/fs/fs.h>
> +#include "header.h"
> +
> +#define MIDR "/regs/identification/midr_el1"
> +#define MIDR_SIZE 19
> +
> +char *get_cpuid_str(struct perf_pmu *pmu)
> +{
> + char *buf = NULL;
> + char path[PATH_MAX];
> + const char *sysfs = sysfs__mountpoint();
> + int cpu;
> + u64 midr = 0;
> + struct cpu_map *cpus;
> + FILE *file;
> +
> + if (!sysfs || !pmu->cpus)
> + return NULL;
> +
> + buf = malloc(MIDR_SIZE);
> + if (!buf)
> + return NULL;
> +
> + /* read midr from list of cpus mapped to this pmu */
> + cpus = cpu_map__get(pmu->cpus);
> + for (cpu = 0; cpu < cpus->nr; cpu++) {
> + scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d"MIDR,
> + sysfs, cpus->map[cpu]);
> +
> + file = fopen(path, "r");
> + if (!file) {
> + pr_debug("fopen failed for file %s\n", path);
> + continue;
> + }
> +
> + if (!fgets(buf, MIDR_SIZE, file))
> + continue;
> + fclose(file);
Don't you want to fclose the file if the fgets fails?
> +
> + /* Ignore/clear Variant[23:20] and
> + * Revision[3:0] of MIDR
> + */
> + midr = strtoul(buf, NULL, 16);
> + midr &= (~(0xf << 20 | 0xf));
It would be cleaner if you had #defines for the MIDR fields that you're
masking.
> + scnprintf(buf, MIDR_SIZE, "0x%016lx", midr);
> + /* got midr break loop */
> + break;
> + }
> +
> + if (!midr) {
> + pr_err("failed to get cpuid string\n");
Might be helpful to print the PMU name and the CPU map if there's a way
to do that.
Will
WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will.deacon@arm.com>
To: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
mark.rutland@arm.com, acme@kernel.org,
alexander.shishkin@linux.intel.com, peterz@infradead.org,
mingo@redhat.com, jnair@caviumnetworks.com,
zhangshaokun@hisilicon.com, Jonathan.Cameron@huawei.com,
Robert.Richter@cavium.com, gklkml16@gmail.com
Subject: Re: [PATCH v6 2/4] perf tools arm64: Add support for get_cpuid_str function.
Date: Wed, 11 Oct 2017 13:13:32 +0100 [thread overview]
Message-ID: <20171011121332.GA11106@arm.com> (raw)
In-Reply-To: <20170824120349.2323-3-ganapatrao.kulkarni@cavium.com>
On Thu, Aug 24, 2017 at 05:33:47PM +0530, Ganapatrao Kulkarni wrote:
> function get_cpuid_str returns MIDR string of the first online
> cpu from the range of cpus associated with the pmu core device.
>
> Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
> ---
> tools/perf/arch/arm64/util/Build | 1 +
> tools/perf/arch/arm64/util/header.c | 60 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 61 insertions(+)
> create mode 100644 tools/perf/arch/arm64/util/header.c
>
> diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/Build
> index cef6fb3..b1ab72d 100644
> --- a/tools/perf/arch/arm64/util/Build
> +++ b/tools/perf/arch/arm64/util/Build
> @@ -1,3 +1,4 @@
> +libperf-y += header.o
> libperf-$(CONFIG_DWARF) += dwarf-regs.o
> libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
>
> diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/util/header.c
> new file mode 100644
> index 0000000..f02a32e
> --- /dev/null
> +++ b/tools/perf/arch/arm64/util/header.c
> @@ -0,0 +1,60 @@
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <api/fs/fs.h>
> +#include "header.h"
> +
> +#define MIDR "/regs/identification/midr_el1"
> +#define MIDR_SIZE 19
> +
> +char *get_cpuid_str(struct perf_pmu *pmu)
> +{
> + char *buf = NULL;
> + char path[PATH_MAX];
> + const char *sysfs = sysfs__mountpoint();
> + int cpu;
> + u64 midr = 0;
> + struct cpu_map *cpus;
> + FILE *file;
> +
> + if (!sysfs || !pmu->cpus)
> + return NULL;
> +
> + buf = malloc(MIDR_SIZE);
> + if (!buf)
> + return NULL;
> +
> + /* read midr from list of cpus mapped to this pmu */
> + cpus = cpu_map__get(pmu->cpus);
> + for (cpu = 0; cpu < cpus->nr; cpu++) {
> + scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d"MIDR,
> + sysfs, cpus->map[cpu]);
> +
> + file = fopen(path, "r");
> + if (!file) {
> + pr_debug("fopen failed for file %s\n", path);
> + continue;
> + }
> +
> + if (!fgets(buf, MIDR_SIZE, file))
> + continue;
> + fclose(file);
Don't you want to fclose the file if the fgets fails?
> +
> + /* Ignore/clear Variant[23:20] and
> + * Revision[3:0] of MIDR
> + */
> + midr = strtoul(buf, NULL, 16);
> + midr &= (~(0xf << 20 | 0xf));
It would be cleaner if you had #defines for the MIDR fields that you're
masking.
> + scnprintf(buf, MIDR_SIZE, "0x%016lx", midr);
> + /* got midr break loop */
> + break;
> + }
> +
> + if (!midr) {
> + pr_err("failed to get cpuid string\n");
Might be helpful to print the PMU name and the CPU map if there's a way
to do that.
Will
next prev parent reply other threads:[~2017-10-11 12:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 12:03 [PATCH v6 0/4] Add support for ThunderX2 pmu events using json files Ganapatrao Kulkarni
2017-08-24 12:03 ` Ganapatrao Kulkarni
2017-08-24 12:03 ` [PATCH v6 1/4] perf utils: passing pmu as a parameter to function get_cpuid_str Ganapatrao Kulkarni
2017-08-24 12:03 ` Ganapatrao Kulkarni
2017-08-24 12:03 ` [PATCH v6 2/4] perf tools arm64: Add support for get_cpuid_str function Ganapatrao Kulkarni
2017-08-24 12:03 ` Ganapatrao Kulkarni
2017-10-11 12:13 ` Will Deacon [this message]
2017-10-11 12:13 ` Will Deacon
2017-10-12 5:15 ` Ganapatrao Kulkarni
2017-10-12 5:15 ` Ganapatrao Kulkarni
2017-08-24 12:03 ` [PATCH v6 3/4] perf utils: Add helper function is_pmu_core to detect PMU CORE devices Ganapatrao Kulkarni
2017-08-24 12:03 ` Ganapatrao Kulkarni
2017-10-11 12:17 ` Will Deacon
2017-10-11 12:17 ` Will Deacon
2017-08-24 12:03 ` [PATCH v6 4/4] perf vendor events arm64: Add ThunderX2 implementation defined pmu core events Ganapatrao Kulkarni
2017-08-24 12:03 ` Ganapatrao Kulkarni
2017-08-29 9:26 ` Zhangshaokun
2017-08-29 9:26 ` Zhangshaokun
2017-08-29 12:47 ` Robert Richter
2017-08-29 12:47 ` Robert Richter
2017-08-30 3:15 ` Zhangshaokun
2017-08-30 3:15 ` Zhangshaokun
2017-08-31 10:29 ` Zhangshaokun
2017-08-31 10:29 ` Zhangshaokun
2017-08-31 10:53 ` Robert Richter
2017-08-31 10:53 ` Robert Richter
2017-10-11 12:19 ` Will Deacon
2017-10-11 12:19 ` Will Deacon
2017-10-11 13:24 ` Robert Richter
2017-10-11 13:24 ` Robert Richter
2017-10-11 13:55 ` Will Deacon
2017-10-11 13:55 ` Will Deacon
2017-10-12 4:56 ` Ganapatrao Kulkarni
2017-10-12 4:56 ` Ganapatrao Kulkarni
2017-09-20 8:45 ` [PATCH v6 0/4] Add support for ThunderX2 pmu events using json files Ganapatrao Kulkarni
2017-09-20 8:45 ` Ganapatrao Kulkarni
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=20171011121332.GA11106@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.