From: Jin Yao <yao.jin@linux.intel.com>
To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org,
mingo@redhat.com, alexander.shishkin@linux.intel.com
Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com,
kan.liang@intel.com, yao.jin@intel.com,
Jin Yao <yao.jin@linux.intel.com>
Subject: [PATCH v6 05/26] perf pmu: Save detected hybrid pmus to a global pmu list
Date: Tue, 27 Apr 2021 15:01:18 +0800 [thread overview]
Message-ID: <20210427070139.25256-6-yao.jin@linux.intel.com> (raw)
In-Reply-To: <20210427070139.25256-1-yao.jin@linux.intel.com>
We identify the cpu_core pmu and cpu_atom pmu by explicitly
checking following files:
For cpu_core, checks:
"/sys/bus/event_source/devices/cpu_core/cpus"
For cpu_atom, checks:
"/sys/bus/event_source/devices/cpu_atom/cpus"
If the 'cpus' file exists and it has data, the pmu exists.
But in order not to hardcode the "cpu_core" and "cpu_atom",
and make the code in a generic way. So if the path
"/sys/bus/event_source/devices/cpu_xxx/cpus" exists, the hybrid
pmu exists. All the detected hybrid pmus are linked to a
global list 'perf_pmu__hybrid_pmus' and then next we just need
to iterate the list to get all hybrid pmu by using
perf_pmu__for_each_hybrid_pmu.
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
v5 - v6:
- No change.
v4:
- Check if 'cpus' file is empty. If so, don't create pmu.
v3:
- No functional change.
tools/perf/util/Build | 1 +
tools/perf/util/pmu-hybrid.c | 49 ++++++++++++++++++++++++++++++++++++
tools/perf/util/pmu-hybrid.h | 18 +++++++++++++
tools/perf/util/pmu.c | 9 ++++++-
tools/perf/util/pmu.h | 4 +++
5 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 tools/perf/util/pmu-hybrid.c
create mode 100644 tools/perf/util/pmu-hybrid.h
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 827d216a780e..45bea9911669 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -69,6 +69,7 @@ perf-y += parse-events-bison.o
perf-y += pmu.o
perf-y += pmu-flex.o
perf-y += pmu-bison.o
+perf-y += pmu-hybrid.o
perf-y += trace-event-read.o
perf-y += trace-event-info.o
perf-y += trace-event-scripting.o
diff --git a/tools/perf/util/pmu-hybrid.c b/tools/perf/util/pmu-hybrid.c
new file mode 100644
index 000000000000..8ed0e6e1776d
--- /dev/null
+++ b/tools/perf/util/pmu-hybrid.c
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/list.h>
+#include <linux/compiler.h>
+#include <linux/string.h>
+#include <linux/zalloc.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include <locale.h>
+#include <api/fs/fs.h>
+#include "fncache.h"
+#include "pmu-hybrid.h"
+
+LIST_HEAD(perf_pmu__hybrid_pmus);
+
+bool perf_pmu__hybrid_mounted(const char *name)
+{
+ char path[PATH_MAX];
+ const char *sysfs;
+ FILE *file;
+ int n, cpu;
+
+ if (strncmp(name, "cpu_", 4))
+ return false;
+
+ sysfs = sysfs__mountpoint();
+ if (!sysfs)
+ return false;
+
+ snprintf(path, PATH_MAX, CPUS_TEMPLATE_CPU, sysfs, name);
+ if (!file_available(path))
+ return false;
+
+ file = fopen(path, "r");
+ if (!file)
+ return false;
+
+ n = fscanf(file, "%u", &cpu);
+ fclose(file);
+ if (n <= 0)
+ return false;
+
+ return true;
+}
diff --git a/tools/perf/util/pmu-hybrid.h b/tools/perf/util/pmu-hybrid.h
new file mode 100644
index 000000000000..35bed3714438
--- /dev/null
+++ b/tools/perf/util/pmu-hybrid.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __PMU_HYBRID_H
+#define __PMU_HYBRID_H
+
+#include <linux/perf_event.h>
+#include <linux/compiler.h>
+#include <linux/list.h>
+#include <stdbool.h>
+#include "pmu.h"
+
+extern struct list_head perf_pmu__hybrid_pmus;
+
+#define perf_pmu__for_each_hybrid_pmu(pmu) \
+ list_for_each_entry(pmu, &perf_pmu__hybrid_pmus, hybrid_list)
+
+bool perf_pmu__hybrid_mounted(const char *name);
+
+#endif /* __PMU_HYBRID_H */
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 44225838eb03..6e49c7b8ad71 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -25,6 +25,7 @@
#include "string2.h"
#include "strbuf.h"
#include "fncache.h"
+#include "pmu-hybrid.h"
struct perf_pmu perf_pmu__fake;
@@ -613,7 +614,6 @@ static struct perf_cpu_map *__pmu_cpumask(const char *path)
*/
#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"
static struct perf_cpu_map *pmu_cpumask(const char *name)
{
@@ -645,6 +645,9 @@ static bool pmu_is_uncore(const char *name)
char path[PATH_MAX];
const char *sysfs;
+ if (perf_pmu__hybrid_mounted(name))
+ return false;
+
sysfs = sysfs__mountpoint();
snprintf(path, PATH_MAX, CPUS_TEMPLATE_UNCORE, sysfs, name);
return file_available(path);
@@ -951,6 +954,7 @@ static struct perf_pmu *pmu_lookup(const char *name)
pmu->is_uncore = pmu_is_uncore(name);
if (pmu->is_uncore)
pmu->id = pmu_id(name);
+ pmu->is_hybrid = perf_pmu__hybrid_mounted(name);
pmu->max_precise = pmu_max_precise(name);
pmu_add_cpu_aliases(&aliases, pmu);
pmu_add_sys_aliases(&aliases, pmu);
@@ -962,6 +966,9 @@ static struct perf_pmu *pmu_lookup(const char *name)
list_splice(&aliases, &pmu->aliases);
list_add_tail(&pmu->list, &pmus);
+ if (pmu->is_hybrid)
+ list_add_tail(&pmu->hybrid_list, &perf_pmu__hybrid_pmus);
+
pmu->default_config = perf_pmu__get_default_config(pmu);
return pmu;
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 4f100768c264..9a2f89eeab6f 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -5,6 +5,7 @@
#include <linux/bitmap.h>
#include <linux/compiler.h>
#include <linux/perf_event.h>
+#include <linux/list.h>
#include <stdbool.h>
#include "parse-events.h"
#include "pmu-events/pmu-events.h"
@@ -19,6 +20,7 @@ enum {
#define PERF_PMU_FORMAT_BITS 64
#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"
+#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus"
struct perf_event_attr;
@@ -34,6 +36,7 @@ struct perf_pmu {
__u32 type;
bool selectable;
bool is_uncore;
+ bool is_hybrid;
bool auxtrace;
int max_precise;
struct perf_event_attr *default_config;
@@ -42,6 +45,7 @@ struct perf_pmu {
struct list_head aliases; /* HEAD struct perf_pmu_alias -> list */
struct list_head caps; /* HEAD struct perf_pmu_caps -> list */
struct list_head list; /* ELEM */
+ struct list_head hybrid_list;
};
extern struct perf_pmu perf_pmu__fake;
--
2.17.1
next prev parent reply other threads:[~2021-04-27 7:03 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 7:01 [PATCH v6 00/26] perf tool: AlderLake hybrid support series 1 Jin Yao
2021-04-27 7:01 ` [PATCH v6 01/26] tools headers uapi: Update tools's copy of linux/perf_event.h Jin Yao
2021-04-27 19:24 ` Arnaldo Carvalho de Melo
2021-04-28 1:18 ` Jin, Yao
2021-04-27 7:01 ` [PATCH v6 02/26] perf jevents: Support unit value "cpu_core" and "cpu_atom" Jin Yao
2021-04-27 7:01 ` [PATCH v6 03/26] perf pmu: Simplify arguments of __perf_pmu__new_alias Jin Yao
2021-04-27 7:01 ` [PATCH v6 04/26] perf pmu: Save pmu name Jin Yao
2021-04-27 7:01 ` Jin Yao [this message]
2021-04-27 7:01 ` [PATCH v6 06/26] perf pmu: Add hybrid helper functions Jin Yao
2021-04-27 7:01 ` [PATCH v6 07/26] perf stat: Uniquify hybrid event name Jin Yao
2021-04-27 7:01 ` [PATCH v6 08/26] perf parse-events: Create two hybrid hardware events Jin Yao
2021-04-27 7:01 ` [PATCH v6 09/26] perf parse-events: Create two hybrid cache events Jin Yao
2021-04-27 7:01 ` [PATCH v6 10/26] perf parse-events: Create two hybrid raw events Jin Yao
2021-04-27 7:01 ` [PATCH v6 11/26] perf parse-events: Compare with hybrid pmu name Jin Yao
2021-04-27 7:01 ` [PATCH v6 12/26] perf parse-events: Support event inside hybrid pmu Jin Yao
2021-04-27 7:01 ` [PATCH v6 13/26] perf record: Create two hybrid 'cycles' events by default Jin Yao
2021-04-27 7:01 ` [PATCH v6 14/26] perf stat: Add default hybrid events Jin Yao
2021-04-27 7:01 ` [PATCH v6 15/26] perf stat: Filter out unmatched aggregation for hybrid event Jin Yao
2021-04-27 7:01 ` [PATCH v6 16/26] perf stat: Warn group events from different hybrid PMU Jin Yao
2021-04-27 7:01 ` [PATCH v6 17/26] perf record: Uniquify hybrid event name Jin Yao
2021-04-27 7:01 ` [PATCH v6 18/26] perf tests: Add hybrid cases for 'Parse event definition strings' test Jin Yao
2021-04-27 7:01 ` [PATCH v6 19/26] perf tests: Add hybrid cases for 'Roundtrip evsel->name' test Jin Yao
2021-04-27 7:01 ` [PATCH v6 20/26] perf tests: Skip 'Setup struct perf_event_attr' test for hybrid Jin Yao
2021-04-27 7:01 ` [PATCH v6 21/26] perf tests: Support 'Track with sched_switch' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 22/26] perf tests: Support 'Parse and process metrics' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 23/26] perf tests: Support 'Session topology' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 24/26] perf tests: Support 'Convert perf time to TSC' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 25/26] perf tests: Skip 'perf stat metrics (shadow stat) test' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 26/26] perf Documentation: Document intel-hybrid support Jin Yao
2021-04-27 12:50 ` [PATCH v6 00/26] perf tool: AlderLake hybrid support series 1 Jiri Olsa
2021-04-27 13:14 ` Arnaldo Carvalho de Melo
2021-04-28 1:57 ` Jin, Yao
2021-04-28 7:28 ` Jiri Olsa
2021-04-28 8:01 ` Jin, Yao
2021-04-28 13:44 ` 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=20210427070139.25256-6-yao.jin@linux.intel.com \
--to=yao.jin@linux.intel.com \
--cc=Linux-kernel@vger.kernel.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=yao.jin@intel.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).