56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 38726b240651795b9559daeab23242db4ba5c7d7 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Thu, 29 Jul 2021 21:56:21 +0800
|
|
Subject: [PATCH 176/201] perf pmu: Check .is_uncore field in
|
|
pmu_add_cpu_aliases_map()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 5806099a2e2ab36fa7a7705faaf3d7296b701e67
|
|
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=5806099a2e2ab36fa7a7705faaf3d7296b701e67
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Calling pmu_is_uncore() for fake PMUs does not work, as it checks sysfs
|
|
for the PMU details (which won't exist).
|
|
|
|
Check .is_uncore field instead, which makes sense anyway.
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: Jin Yao <yao.jin@linux.intel.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: linuxarm@huawei.com
|
|
Link: https //lore.kernel.org/r/1627566986-30605-7-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/pmu.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 089b5af03f98..172819439cdd 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -885,8 +885,7 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
break;
|
|
}
|
|
|
|
- if (pmu_is_uncore(name) &&
|
|
- pmu_uncore_alias_match(pname, name))
|
|
+ if (pmu->is_uncore && pmu_uncore_alias_match(pname, name))
|
|
goto new_alias;
|
|
|
|
if (strcmp(pname, name))
|
|
--
|
|
2.27.0
|
|
|