From: John Garry <john.garry@huawei.com>
To: <acme@kernel.org>, <will@kernel.org>, <mark.rutland@arm.com>,
<jolsa@redhat.com>, <irogers@google.com>, <leo.yan@linaro.org>,
<peterz@infradead.org>, <mingo@redhat.com>,
<alexander.shishkin@linux.intel.com>, <namhyung@kernel.org>,
<mathieu.poirier@linaro.org>
Cc: linux-kernel@vger.kernel.org, John Garry <john.garry@huawei.com>,
qiangqing.zhang@nxp.com, linuxarm@huawei.com,
zhangshaokun@hisilicon.com, james.clark@arm.com,
linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com
Subject: [PATCH RFC v4 03/13] perf pmu: Add pmu_id()
Date: Thu, 8 Oct 2020 18:15:11 +0800 [thread overview]
Message-ID: <1602152121-240367-4-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1602152121-240367-1-git-send-email-john.garry@huawei.com>
Add a function to read the PMU id sysfs entry. This is only done for uncore
PMUs where this would possibly be relevant.
Signed-off-by: John Garry <john.garry@huawei.com>
---
tools/perf/util/pmu.c | 18 ++++++++++++++++++
tools/perf/util/pmu.h | 1 +
2 files changed, 19 insertions(+)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index d41caeb35cf6..cbeda45ce578 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -597,6 +597,7 @@ static struct perf_cpu_map *__pmu_cpumask(const char *path)
* Uncore PMUs have a "cpumask" file under sysfs. CPU PMUs (e.g. on arm/arm64)
* may have a "cpus" file.
*/
+#define SYS_TEMPLATE_ID "./bus/event_source/devices/%s/identifier"
#define CPUS_TEMPLATE_UNCORE "%s/bus/event_source/devices/%s/cpumask"
#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus"
@@ -635,6 +636,21 @@ static bool pmu_is_uncore(const char *name)
return file_available(path);
}
+static char *pmu_id(const char *name)
+{
+ char path[PATH_MAX], *str;
+ size_t len;
+
+ snprintf(path, PATH_MAX, SYS_TEMPLATE_ID, name);
+
+ if (sysfs__read_str(path, &str, &len) < 0)
+ return NULL;
+
+ str[len - 1] = 0; /* remove line feed */
+
+ return str;
+}
+
/*
* PMU CORE devices have different name other than cpu in sysfs on some
* platforms.
@@ -847,6 +863,8 @@ static struct perf_pmu *pmu_lookup(const char *name)
pmu->name = strdup(name);
pmu->type = type;
pmu->is_uncore = pmu_is_uncore(name);
+ if (pmu->is_uncore)
+ pmu->id = pmu_id(name);
pmu->max_precise = pmu_max_precise(name);
pmu_add_cpu_aliases(&aliases, pmu);
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index a64e9c9ce731..d4366e8e79df 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -30,6 +30,7 @@ struct perf_pmu_caps {
struct perf_pmu {
char *name;
+ char *id;
__u32 type;
bool selectable;
bool is_uncore;
--
2.26.2
_______________________________________________
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-10-08 10:21 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 10:15 [PATCH RFC v4 00/13] perf pmu-events: Support event aliasing for system PMUs John Garry
2020-10-08 10:15 ` [PATCH RFC v4 01/13] perf jevents: Add support for an extra directory level John Garry
2020-10-08 10:15 ` [PATCH RFC v4 02/13] perf jevents: Add support for system events tables John Garry
2020-10-08 10:15 ` John Garry [this message]
2020-10-08 10:15 ` [PATCH RFC v4 04/13] perf pmu: Add pmu_add_sys_aliases() John Garry
2020-10-08 10:15 ` [PATCH RFC v4 05/13] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry
2020-10-08 10:15 ` [PATCH RFC v4 06/13] perf vendor events arm64: Add hip09 SMMUv3 PMCG events John Garry
2020-10-14 18:06 ` Robin Murphy
2020-10-15 7:47 ` John Garry
2020-10-08 10:15 ` [PATCH RFC v4 07/13] perf vendor events arm64: Add hip09 uncore events John Garry
2020-10-08 10:15 ` [PATCH RFC v4 08/13] perf metricgroup: Fix uncore metric expressions John Garry
2020-10-08 10:15 ` [PATCH RFC v4 09/13] perf metricgroup: Hack a fix for aliases when covering multiple PMUs John Garry
[not found] ` <20201018085031.GK11647@shao2-debian>
2020-10-18 23:30 ` [perf metricgroup] fcc9c5243c: perf-sanity-tests.Parse_and_process_metrics.fail Ian Rogers
2020-10-19 1:52 ` Andi Kleen
2020-10-19 8:02 ` Jin, Yao
2020-10-19 9:48 ` John Garry
2020-10-19 11:49 ` Jin, Yao
2020-10-19 16:20 ` Ian Rogers
2020-10-19 17:04 ` John Garry
2020-10-20 8:56 ` kajoljain
2020-10-20 16:53 ` Ian Rogers
2020-11-03 14:43 ` John Garry
2020-11-03 16:05 ` Ian Rogers
2020-11-03 16:54 ` John Garry
2020-11-04 4:58 ` kajoljain
2020-10-08 10:15 ` [PATCH RFC v4 10/13] perf metricgroup: Split up metricgroup__print() John Garry
2020-10-08 10:15 ` [PATCH RFC v4 11/13] perf metricgroup: Support printing metric groups for system PMUs John Garry
2020-10-08 10:15 ` [PATCH RFC v4 12/13] perf metricgroup: Support adding metrics " John Garry
2020-10-08 10:15 ` [PATCH RFC v4 13/13] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry
2020-10-12 10:03 ` Joakim Zhang
2020-10-12 10:34 ` John Garry
2020-10-08 11:27 ` [PATCH RFC v4 00/13] perf pmu-events: Support event aliasing for system PMUs kajoljain
2020-10-08 11:49 ` John Garry
2020-10-14 11:16 ` Jiri Olsa
2020-10-14 17:41 ` John Garry
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=1602152121-240367-4-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=qiangqing.zhang@nxp.com \
--cc=will@kernel.org \
--cc=zhangshaokun@hisilicon.com \
/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).