Commit 1f297a6e authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Allocate evsel->stats->aggr properly 



The perf_stat_config.aggr_map should have a correct size of the
aggregation map.  Use it to allocate aggr_counts.

Also AGGR_NONE with per-core events can be tricky because it doesn't
aggreate basically but it needs to do so for per-core events only.
So only per-core evsels will have stats->aggr data.

Note that other caller of evlist__alloc_stat() might not have
stat_config or aggr_map.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221018020227.85905-9-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ca68b374

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -2049,7 +2049,7 @@ static void perf_sample__fprint_metric(struct perf_script *script, 
	u64 val;



	if (!evsel->stats)

		evlist__alloc_stats(script->session->evlist, false);

		evlist__alloc_stats(&stat_config, script->session->evlist, /*alloc_raw=*/false);

	if (evsel_script(leader)->gnum++ == 0)

		perf_stat__reset_shadow_stats();

	val = sample->period * evsel->scale;
@@ -3632,7 +3632,7 @@ static int set_maps(struct perf_script *script) 


	perf_evlist__set_maps(&evlist->core, script->cpus, script->threads);



	if (evlist__alloc_stats(evlist, true))

	if (evlist__alloc_stats(&stat_config, evlist, /*alloc_raw=*/true))

		return -ENOMEM;



	script->allocated = true;

tools/perf/builtin-stat.c

+3 −3
Original line number Diff line number Diff line
@@ -2121,7 +2121,7 @@ static int set_maps(struct perf_stat *st) 


	perf_evlist__set_maps(&evsel_list->core, st->cpus, st->threads);



	if (evlist__alloc_stats(evsel_list, true))

	if (evlist__alloc_stats(&stat_config, evsel_list, /*alloc_raw=*/true))

		return -ENOMEM;



	st->maps_allocated = true;
@@ -2568,10 +2568,10 @@ int cmd_stat(int argc, const char **argv) 
		goto out;

	}



	if (evlist__alloc_stats(evsel_list, interval))

	if (perf_stat_init_aggr_mode())

		goto out;



	if (perf_stat_init_aggr_mode())

	if (evlist__alloc_stats(&stat_config, evsel_list, interval))

		goto out;



	/*

tools/perf/tests/parse-metric.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int __compute_metric(const char *name, struct value *vals, 
	if (err)

		goto out;



	err = evlist__alloc_stats(evlist, false);

	err = evlist__alloc_stats(/*config=*/NULL, evlist, /*alloc_raw=*/false);

	if (err)

		goto out;

tools/perf/tests/pmu-events.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int test__parsing_callback(const struct pmu_event *pe, const struct pmu_e 
		goto out_err;

	}



	err = evlist__alloc_stats(evlist, false);

	err = evlist__alloc_stats(/*config=*/NULL, evlist, /*alloc_raw=*/false);

	if (err)

		goto out_err;

	/*

tools/perf/util/stat.c

+7 −2
Original line number Diff line number Diff line
@@ -211,12 +211,17 @@ static int evsel__alloc_stats(struct evsel *evsel, int nr_aggr, bool alloc_raw) 
	return 0;

}



int evlist__alloc_stats(struct evlist *evlist, bool alloc_raw)

int evlist__alloc_stats(struct perf_stat_config *config,

			struct evlist *evlist, bool alloc_raw)

{

	struct evsel *evsel;

	int nr_aggr = 0;



	if (config && config->aggr_map)

		nr_aggr = config->aggr_map->nr;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel__alloc_stats(evsel, 0, alloc_raw))

		if (evsel__alloc_stats(evsel, nr_aggr, alloc_raw))

			goto out_free;

	}