76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From 7a3cf279e516bef36cd731957adb70761653873a Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Thu, 10 Jun 2021 22:33:00 +0800
|
|
Subject: [PATCH 198/201] perf metricgroup: Return error code from
|
|
metricgroup__add_metric_sys_event_iter()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.13-rc7
|
|
commit fe7a98b9d9b36e5c8a22d76b67d29721f153f66e
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fe7a98b9d9b36e5c8a22d76b67d29721f153f66e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/metricgroup.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 2eaaa96d009a..523123ec1bd2 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -1072,16 +1072,18 @@ static int metricgroup__add_metric_sys_event_iter(struct pmu_event *pe,
|
|
|
|
ret = add_metric(d->metric_list, pe, d->metric_no_group, d->m, NULL, d->ids);
|
|
if (ret)
|
|
- return ret;
|
|
+ goto out;
|
|
|
|
ret = resolve_metric(d->metric_no_group,
|
|
d->metric_list, NULL, d->ids);
|
|
if (ret)
|
|
- return ret;
|
|
+ goto out;
|
|
|
|
*(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,
|
|
--
|
|
2.27.0
|
|
|