106 lines
3.8 KiB
Diff
106 lines
3.8 KiB
Diff
From 7b8c9c01545bd1614004948af4d66875a55bb6f7 Mon Sep 17 00:00:00 2001
|
|
From: Wei Li <liwei391@huawei.com>
|
|
Date: Fri, 24 Jul 2020 15:11:10 +0800
|
|
Subject: [PATCH 2/7] perf tools: Fix record failure when mixed with ARM SPE
|
|
event
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 31e81e0bed8b4a9c2bb6914c36cf6a8b4ef8a9b7
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8DP81
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=31e81e0bed8b4a9c2bb6914c36cf6a8b4ef8a9b7
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
When recording with cache-misses and arm_spe_x event, I found that it
|
|
will just fail without showing any error info if i put cache-misses
|
|
after 'arm_spe_x' event.
|
|
|
|
[root@localhost 0620]# perf record -e cache-misses \
|
|
-e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ sleep 1
|
|
[ perf record: Woken up 1 times to write data ]
|
|
[ perf record: Captured and wrote 0.067 MB perf.data ]
|
|
[root@localhost 0620]#
|
|
[root@localhost 0620]# perf record -e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ \
|
|
-e cache-misses sleep 1
|
|
[root@localhost 0620]#
|
|
|
|
The current code can only work if the only event to be traced is an
|
|
'arm_spe_x', or if it is the last event to be specified. Otherwise the
|
|
last event type will be checked against all the arm_spe_pmus[i]->types,
|
|
none will match and an out of bound 'i' index will be used in
|
|
arm_spe_recording_init().
|
|
|
|
We don't support concurrent multiple arm_spe_x events currently, that
|
|
is checked in arm_spe_recording_options(), and it will show the relevant
|
|
info. So add the check and record of the first found 'arm_spe_pmu' to
|
|
fix this issue here.
|
|
|
|
Fixes: ffd3d18c20b8 ("perf tools: Add ARM Statistical Profiling Extensions (SPE) support")
|
|
Signed-off-by: Wei Li <liwei391@huawei.com>
|
|
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Tested-by-by: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Hanjun Guo <guohanjun@huawei.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Kim Phillips <kim.phillips@arm.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mike Leach <mike.leach@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Link: http://lore.kernel.org/lkml/20200724071111.35593-2-liwei391@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/arch/arm/util/auxtrace.c
|
|
---
|
|
tools/perf/arch/arm/util/auxtrace.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c
|
|
index 1ce6bdbda561..b9d471a0babd 100644
|
|
--- a/tools/perf/arch/arm/util/auxtrace.c
|
|
+++ b/tools/perf/arch/arm/util/auxtrace.c
|
|
@@ -54,7 +54,7 @@ struct auxtrace_record
|
|
struct perf_pmu *cs_etm_pmu;
|
|
struct perf_evsel *evsel;
|
|
bool found_etm = false;
|
|
- bool found_spe = false;
|
|
+ struct perf_pmu *found_spe = NULL;
|
|
static struct perf_pmu **arm_spe_pmus = NULL;
|
|
static int nr_spes = 0;
|
|
int i = 0;
|
|
@@ -72,12 +72,12 @@ struct auxtrace_record
|
|
evsel->attr.type == cs_etm_pmu->type)
|
|
found_etm = true;
|
|
|
|
- if (!nr_spes)
|
|
+ if (!nr_spes || found_spe)
|
|
continue;
|
|
|
|
for (i = 0; i < nr_spes; i++) {
|
|
if (evsel->attr.type == arm_spe_pmus[i]->type) {
|
|
- found_spe = true;
|
|
+ found_spe = arm_spe_pmus[i];
|
|
break;
|
|
}
|
|
}
|
|
@@ -94,7 +94,7 @@ struct auxtrace_record
|
|
|
|
#if defined(__aarch64__)
|
|
if (found_spe)
|
|
- return arm_spe_recording_init(err, arm_spe_pmus[i]);
|
|
+ return arm_spe_recording_init(err, found_spe);
|
|
#endif
|
|
|
|
/*
|
|
--
|
|
2.27.0
|
|
|