| Message ID | 20220328062414.1893550-5-irogers@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Make evlist CPUs more accurate | expand |
Em Sun, Mar 27, 2022 at 11:24:13PM -0700, Ian Rogers escreveu: > Passing null to perf_cpu_map__max doesn't make sense as there is no > valid max. Avoid this problem by null checking in > perf_stat_init_aggr_mode. Applying this one after changing user_cpus back to cpus as this is a fix independent of this patchset. In the future, please try to have such patches at the beginning of the series, so that they can get cherry-picked more easily. - Arnaldo > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/builtin-stat.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 5bee529f7656..ecd5cf4fd872 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1472,7 +1472,10 @@ static int perf_stat_init_aggr_mode(void) > * taking the highest cpu number to be the size of > * the aggregation translate cpumap. > */ > - nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; > + if (evsel_list->core.user_cpus) > + nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; > + else > + nr = 0; > stat_config.cpus_aggr_map = cpu_aggr_map__empty_new(nr + 1); > return stat_config.cpus_aggr_map ? 0 : -ENOMEM; > } > -- > 2.35.1.1021.g381101b075-goog
On Mon, Mar 28, 2022 at 1:32 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Sun, Mar 27, 2022 at 11:24:13PM -0700, Ian Rogers escreveu: > > Passing null to perf_cpu_map__max doesn't make sense as there is no > > valid max. Avoid this problem by null checking in > > perf_stat_init_aggr_mode. > > Applying this one after changing user_cpus back to cpus as this is a fix > independent of this patchset. > > In the future, please try to have such patches at the beginning of the > series, so that they can get cherry-picked more easily. Ack. The problem is best exhibited when the intersect happens, without it getting a reproducer wasn't something I was able to do. Thanks, Ian > - Arnaldo > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/builtin-stat.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > > index 5bee529f7656..ecd5cf4fd872 100644 > > --- a/tools/perf/builtin-stat.c > > +++ b/tools/perf/builtin-stat.c > > @@ -1472,7 +1472,10 @@ static int perf_stat_init_aggr_mode(void) > > * taking the highest cpu number to be the size of > > * the aggregation translate cpumap. > > */ > > - nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; > > + if (evsel_list->core.user_cpus) > > + nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; > > + else > > + nr = 0; > > stat_config.cpus_aggr_map = cpu_aggr_map__empty_new(nr + 1); > > return stat_config.cpus_aggr_map ? 0 : -ENOMEM; > > } > > -- > > 2.35.1.1021.g381101b075-goog > > -- > > - Arnaldo
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 5bee529f7656..ecd5cf4fd872 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1472,7 +1472,10 @@ static int perf_stat_init_aggr_mode(void) * taking the highest cpu number to be the size of * the aggregation translate cpumap. */ - nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; + if (evsel_list->core.user_cpus) + nr = perf_cpu_map__max(evsel_list->core.user_cpus).cpu; + else + nr = 0; stat_config.cpus_aggr_map = cpu_aggr_map__empty_new(nr + 1); return stat_config.cpus_aggr_map ? 0 : -ENOMEM; }
Passing null to perf_cpu_map__max doesn't make sense as there is no valid max. Avoid this problem by null checking in perf_stat_init_aggr_mode. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/builtin-stat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)