hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf metricgroup: Return error code from metricgroup__add_metric_sys_event_iter() 

The error code is not set at all in the sys event iter function.

This may lead to an uninitialized value of "ret" in
metricgroup__add_metric() when no CPU metric is added.

Fix by properly setting the error code.

It is not necessary to init "ret" to 0 in metricgroup__add_metric(), as
if we have no CPU or sys event metric matching, then "has_match" should
be 0 and "ret" is set to -EINVAL.

However gcc cannot detect that it may not have been set after the
map_for_each_metric() loop for CPU metrics, which is strange.

Fixes: be335ec28e ("perf metricgroup: Support adding metrics for system PMUs")
Signed-off-by: John Garry <john.garry@huawei.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/1623335580-187317-3-git-send-email-john.garry@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
John Garry 2021-06-10 22:33:00 +08:00 committed by Arnaldo Carvalho de Melo
parent fc96ec4d5d
commit fe7a98b9d9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/util/metricgroup.c
View File

@ -1073,16 +1073,18 @@ static int metricgroup__add_metric_sys_event_iter(struct pmu_event *pe,
ret = add_metric(d->metric_list, pe, d->metric_no_group, &m, NULL, d->ids); ret = add_metric(d->metric_list, pe, d->metric_no_group, &m, NULL, d->ids);
if (ret) if (ret)
return ret; goto out;
ret = resolve_metric(d->metric_no_group, ret = resolve_metric(d->metric_no_group,
d->metric_list, NULL, d->ids); d->metric_list, NULL, d->ids);
if (ret) if (ret)
return ret; goto out;
*(d->has_match) = true; *(d->has_match) = true;
return *d->ret; out:
*(d->ret) = ret;
return ret;
} }
static int metricgroup__add_metric(const char *metric, bool metric_no_group, static int metricgroup__add_metric(const char *metric, bool metric_no_group,