106 lines
3.3 KiB
Diff
106 lines
3.3 KiB
Diff
From 5f55790d197eb2a55f645e5f30fc8f08e034ec28 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Fri, 4 Dec 2020 19:10:09 +0800
|
|
Subject: [PATCH 157/201] perf pmu: Add pmu_id()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit 51d548471510843e56d9f427aa6473ca0981c4a4
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=51d548471510843e56d9f427aa6473ca0981c4a4
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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>
|
|
Acked-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Kim Phillips <kim.phillips@amd.com>
|
|
Cc: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
|
|
Cc: Will Deacon <will@kernel.org>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: linuxarm@huawei.com
|
|
Link: http://lore.kernel.org/lkml/1607080216-36968-4-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/pmu.c
|
|
---
|
|
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 b8594a6c0c23..8fdcf3b63a19 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -597,6 +597,7 @@ static struct 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"
|
|
|
|
@@ -638,6 +639,21 @@ static bool pmu_is_uncore(const char *name)
|
|
return !!cpus;
|
|
}
|
|
|
|
+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.
|
|
@@ -885,6 +901,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_add_cpu_aliases(&aliases, pmu);
|
|
|
|
INIT_LIST_HEAD(&pmu->format);
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index b440053bf4e7..cc055cb1c841 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -22,6 +22,7 @@ struct perf_event_attr;
|
|
|
|
struct perf_pmu {
|
|
char *name;
|
|
+ char *id;
|
|
__u32 type;
|
|
bool selectable;
|
|
bool is_uncore;
|
|
--
|
|
2.27.0
|
|
|