115 lines
3.6 KiB
Diff
115 lines
3.6 KiB
Diff
From 11fb15685ec24cd84117e1c2a961838614bfff2a Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Tue, 17 Mar 2020 19:02:15 +0800
|
|
Subject: [PATCH 066/201] perf pmu: Refactor pmu_add_cpu_aliases()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.7-rc1
|
|
commit e45ad701e784e0eed8a07b537b47afb302c59dab
|
|
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=e45ad701e784e0eed8a07b537b47afb302c59dab
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Create pmu_add_cpu_aliases_map() from pmu_add_cpu_aliases(), so the caller
|
|
can pass the map; the pmu-events test would use this since there would
|
|
be no CPUID matching to a mapfile there.
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: James Clark <james.clark@arm.com>
|
|
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Will Deacon <will@kernel.org>
|
|
Cc: linuxarm@huawei.com
|
|
Link: http://lore.kernel.org/lkml/1584442939-8911-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 | 21 +++++++++++++--------
|
|
tools/perf/util/pmu.h | 3 +++
|
|
2 files changed, 16 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 2d06db85c135..7053b0c5cdae 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -18,7 +18,6 @@
|
|
#include "parse-events.h"
|
|
#include "cpumap.h"
|
|
#include "header.h"
|
|
-#include "pmu-events/pmu-events.h"
|
|
#include "cache.h"
|
|
#include "string2.h"
|
|
|
|
@@ -791,16 +790,11 @@ static bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
|
|
* to the current running CPU. Then, add all PMU events from that table
|
|
* as aliases.
|
|
*/
|
|
-static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
|
|
+void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
+ struct pmu_events_map *map)
|
|
{
|
|
int i;
|
|
- struct pmu_events_map *map;
|
|
const char *name = pmu->name;
|
|
-
|
|
- map = perf_pmu__find_map(pmu);
|
|
- if (!map)
|
|
- return;
|
|
-
|
|
/*
|
|
* Found a matching PMU events table. Create aliases
|
|
*/
|
|
@@ -835,6 +829,17 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
|
|
}
|
|
}
|
|
|
|
+static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
|
|
+{
|
|
+ struct pmu_events_map *map;
|
|
+
|
|
+ map = perf_pmu__find_map(pmu);
|
|
+ if (!map)
|
|
+ return;
|
|
+
|
|
+ pmu_add_cpu_aliases_map(head, pmu, map);
|
|
+}
|
|
+
|
|
struct perf_event_attr * __weak
|
|
perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
|
|
{
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index a7f1d60c288b..acb6f0ebae08 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -8,6 +8,7 @@
|
|
#include <stdbool.h>
|
|
#include "evsel.h"
|
|
#include "parse-events.h"
|
|
+#include "pmu-events/pmu-events.h"
|
|
|
|
enum {
|
|
PERF_PMU_FORMAT_VALUE_CONFIG,
|
|
@@ -93,6 +94,8 @@ int perf_pmu__scan_file(struct perf_pmu *pmu, const char *name, const char *fmt,
|
|
int perf_pmu__test(void);
|
|
|
|
struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu);
|
|
+void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
+ struct pmu_events_map *map);
|
|
|
|
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
|
|
|
|
--
|
|
2.27.0
|
|
|