linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
	<mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
	<jolsa@redhat.com>, <namhyung@kernel.org>, <will@kernel.org>
Cc: <ak@linux.intel.com>, <linuxarm@huawei.com>,
	<linux-kernel@vger.kernel.org>, <qiangqing.zhang@nxp.com>,
	<irogers@google.com>, <robin.murphy@arm.com>,
	<zhangshaokun@hisilicon.com>,
	<linux-arm-kernel@lists.infradead.org>,
	John Garry <john.garry@huawei.com>
Subject: [RFC PATCH v2 07/13] perf pmu: Add pmu_id()
Date: Fri, 17 Apr 2020 18:41:18 +0800	[thread overview]
Message-ID: <1587120084-18990-8-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1587120084-18990-1-git-send-email-john.garry@huawei.com>

Add a function to read the PMU id sysfs entry. We only do it for uncore
PMUs where this would be relevant.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 tools/perf/util/pmu.c | 36 ++++++++++++++++++++++++++++++++++++
 tools/perf/util/pmu.h |  1 +
 2 files changed, 37 insertions(+)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index ef6a63f3d386..6a67c6a28d08 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -594,6 +594,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 CPUS_TEMPLATE_ID	"%s/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"
 
@@ -632,6 +633,39 @@ static bool pmu_is_uncore(const char *name)
 	return file_available(path);
 }
 
+static char *pmu_id(const char *name)
+{
+	char path[PATH_MAX], *id;
+	const char *sysfs;
+	FILE *file;
+	int n;
+
+	sysfs = sysfs__mountpoint();
+	snprintf(path, PATH_MAX, CPUS_TEMPLATE_ID, sysfs, name);
+
+	id = malloc(PATH_MAX);
+	if (!id)
+		return NULL;
+
+	file = fopen(path, "r");
+	if (!file) {
+		free(id);
+		return NULL;
+	}
+
+	n = fscanf(file, "%s", id);
+
+	fclose(file);
+
+	if (!n) {
+		free(id);
+		return NULL;
+	}
+
+	return id;
+}
+
+
 /*
  *  PMU CORE devices have different name other than cpu in sysfs on some
  *  platforms.
@@ -844,6 +878,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 5fb3f16828df..62ebca9481fe 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -24,6 +24,7 @@ struct perf_event_attr;
 
 struct perf_pmu {
 	char *name;
+	char *id;
 	__u32 type;
 	bool selectable;
 	bool is_uncore;
-- 
2.16.4


  parent reply	other threads:[~2020-04-17 10:45 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-17 10:41 [RFC PATCH v2 00/13] perf pmu-events: Support event aliasing for system PMUs John Garry
2020-04-17 10:41 ` [RFC PATCH v2 01/13] perf parse-events: Fix comparison of evsel and leader pmu name John Garry
2020-04-27  8:16   ` Jiri Olsa
2020-04-27  9:03     ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 02/13] perf jevents: Add support for an extra directory level John Garry
2020-04-17 10:41 ` [RFC PATCH v2 03/13] perf jevents: Add support for system events tables John Garry
2020-04-17 10:41 ` [RFC PATCH v2 04/13] perf vendor events arm64: Relocate hip08 events John Garry
2020-04-17 10:41 ` [RFC PATCH v2 05/13] perf vendor events arm64: Add Architected events smmuv3-pmcg.json John Garry
2020-04-17 15:13   ` Ian Rogers
2020-04-17 16:14     ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 06/13] perf vendor events arm64: Add hip08 SMMUv3 PMCG events John Garry
2020-04-17 10:41 ` John Garry [this message]
2020-04-22 11:41   ` [RFC PATCH v2 07/13] perf pmu: Add pmu_id() Jiri Olsa
2020-04-22 11:54     ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 08/13] perf pmu: Add pmu_add_sys_aliases() John Garry
2020-04-17 10:41 ` [RFC PATCH v2 09/13] perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry
2020-04-20  4:17   ` Joakim Zhang
2020-04-20 10:50     ` John Garry
2020-04-20 11:25       ` Joakim Zhang
2020-04-20 14:20         ` John Garry
2020-04-21  2:40           ` Joakim Zhang
2020-04-21 12:28             ` John Garry
2020-04-27  8:09               ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 10/13] perf metricgroup: Split up metricgroup__add_metric() John Garry
2020-04-22 11:44   ` Jiri Olsa
2020-04-22 12:00     ` John Garry
2020-04-17 10:41 ` [RFC PATCH v2 11/13] perf metricgroup: Split up metricgroup__print() John Garry
2020-04-17 10:41 ` [RFC PATCH v2 12/13] perf metricgroup: Support printing metric groups for system PMUs John Garry
2020-04-17 10:41 ` [RFC PATCH v2 13/13] perf metricgroup: Support adding metrics " 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=1587120084-18990-8-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=irogers@google.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=qiangqing.zhang@nxp.com \
    --cc=robin.murphy@arm.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).