From 9639640bdfc55f4f5a904e36b60df0a8c331ffa5 Mon Sep 17 00:00:00 2001 From: Tan Xiaojun Date: Mon, 25 Nov 2019 10:58:19 +0800 Subject: [PATCH] arm_spe: Fix the bug in arm_spe_flush hulk inclusion category: feature bugzilla: 18657 CVE: NA ------------------------------------------- The parsing of spe-c2c requires the processing of spe data, so the logic here needs to be modified. Signed-off-by: Tan Xiaojun Signed-off-by: Wei Li Reviewed-by: Xuefeng Wang Reviewed-by: Tan Xiaojun Signed-off-by: Yang Yingliang --- tools/perf/util/arm-spe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index f62cd5a1b9e1..bd6d311625c4 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -1051,10 +1051,12 @@ static int arm_spe_flush(struct perf_session *session __maybe_unused, return arm_spe_process_timeless_queues(spe, -1, MAX_TIMESTAMP - 1); + ret = arm_spe_process_queues(spe, MAX_TIMESTAMP); + if (ret < 0) + return ret; + if (spe->sample_c2c_mode) ret = arm_spe_c2c_process(spe); - else - ret = arm_spe_process_queues(spe, MAX_TIMESTAMP); return ret; } -- GitLab