perf metricgroup: Return error code from metricgroup__add_metric_sys_event_iter()
authorJohn Garry <john.garry@huawei.com>
Thu, 10 Jun 2021 14:33:00 +0000 (22:33 +0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 19 Jun 2021 13:06:46 +0000 (10:06 -0300)
commitfe7a98b9d9b36e5c8a22d76b67d29721f153f66e
tree0964075bea1ec44a800400663d4d5335d77ac8cb
parentfc96ec4d5d4155c61cbafd49fb2dd403c899a9f4
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: be335ec28efa8 ("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>
tools/perf/util/metricgroup.c