[5.17,126/158] perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events

Commit Message

Greg Kroah-Hartman May 23, 2022, 5:04 p.m. UTC

From: Ian Rogers <[e-mail]>

[ Upstream commit 92d579ea3279aa87392b862df5810f0a7e30fcc6 ]

Stat events can come from disk and so need a degree of validation. They
contain a CPU which needs looking up via CPU map to access a counter.

Add the CPU to index translation, alongside validity checking.

Discussion thread:

  https://lore.kernel.org/linux-perf-users/CAP-5=fWQR=sCuiSMktvUtcbOLidEpUJLCybVF6=[e-mail]/

Fixes: 7ac0089d138f80dc ("perf evsel: Pass cpu not cpu map index to synthesize")
Reported-by: Michael Petlan <[e-mail]>
Suggested-by: Michael Petlan <[e-mail]>
Signed-off-by: Ian Rogers <[e-mail]>
Cc: Alexander Shishkin <[e-mail]>
Cc: Alexei Starovoitov <[e-mail]>
Cc: Andrii Nakryiko <[e-mail]>
Cc: Daniel Borkmann <[e-mail]>
Cc: Dave Marchevsky <[e-mail]>
Cc: Ian Rogers <[e-mail]>
Cc: James Clark <[e-mail]>
Cc: Jiri Olsa <[e-mail]>
Cc: John Fastabend <[e-mail]>
Cc: Kan Liang <[e-mail]>
Cc: KP Singh <[e-mail]>
Cc: Lv Ruyi <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Martin KaFai Lau <[e-mail]>
Cc: Michael Petlan <[e-mail]>
Cc: Namhyung Kim <[e-mail]>
Cc: [e-mail]
Cc: Peter Zijlstra <[e-mail]>
Cc: Quentin Monnet <[e-mail]>
Cc: Song Liu <[e-mail]>
Cc: Stephane Eranian <[e-mail]>
Cc: Xing Zhengjun <[e-mail]>
Cc: Yonghong Song <[e-mail]>
Link: http://lore.kernel.org/lkml/[e-mail]
Signed-off-by: Arnaldo Carvalho de Melo <[e-mail]>
Signed-off-by: Sasha Levin <[e-mail]>
---
 tools/perf/util/stat.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Comments

[e-mail] May 25, 2022, 8:05 p.m. UTC | #1

Hello:

This patch was applied to netdev/net.git (master)
by Arnaldo Carvalho de Melo <[e-mail]>:

On Mon, 23 May 2022 19:04:43 +0200 you wrote:
> From: Ian Rogers <[e-mail]>
> 
> [ Upstream commit 92d579ea3279aa87392b862df5810f0a7e30fcc6 ]
> 
> Stat events can come from disk and so need a degree of validation. They
> contain a CPU which needs looking up via CPU map to access a counter.
> 
> [...]

Here is the summary with links:
  - [5.17,126/158] perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events
    https://git.kernel.org/netdev/net/c/92d579ea3279

You are awesome, thank you!

Patch

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index ee6f03481215..9c230b908b76 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -471,9 +471,10 @@  int perf_stat_process_counter(struct perf_stat_config *config,
 int perf_event__process_stat_event(struct perf_session *session,
 				   union perf_event *event)
 {
-	struct perf_counts_values count;
+	struct perf_counts_values count, *ptr;
 	struct perf_record_stat *st = &event->stat;
 	struct evsel *counter;
+	int cpu_map_idx;
 
 	count.val = st->val;
 	count.ena = st->ena;
@@ -484,8 +485,18 @@  int perf_event__process_stat_event(struct perf_session *session,
 		pr_err("Failed to resolve counter for stat event.\n");
 		return -EINVAL;
 	}
-
-	*perf_counts(counter->counts, st->cpu, st->thread) = count;
+	cpu_map_idx = perf_cpu_map__idx(evsel__cpus(counter), (struct perf_cpu){.cpu = st->cpu});
+	if (cpu_map_idx == -1) {
+		pr_err("Invalid CPU %d for event %s.\n", st->cpu, evsel__name(counter));
+		return -EINVAL;
+	}
+	ptr = perf_counts(counter->counts, cpu_map_idx, st->thread);
+	if (ptr == NULL) {
+		pr_err("Failed to find perf count for CPU %d thread %d on event %s.\n",
+			st->cpu, st->thread, evsel__name(counter));
+		return -EINVAL;
+	}
+	*ptr = count;
 	counter->supported = true;
 	return 0;
 }