diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 15:32:49 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-23 15:32:49 +0300 |
commit | 0869331fbaa2c11c9e94e45305d17ce447189a0a (patch) | |
tree | ceb7a26a3f39146dcf9bec3667ff19169bd5026b /tools/perf/util/stat.c | |
parent | e0e14cdff31d326f81e0edbd5140f788c870756c (diff) | |
parent | 4b0986a3613c92f4ec1bdc7f60ec66fea135991f (diff) | |
download | linux-0869331fbaa2c11c9e94e45305d17ce447189a0a.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf/core
To get the rest of 5.18.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/stat.c')
-rw-r--r-- | tools/perf/util/stat.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 4a5f3b8ff820..a77c28232298 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -474,9 +474,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; @@ -487,8 +488,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; } |