85 lines
3.6 KiB
Diff
85 lines
3.6 KiB
Diff
From 7101da9fa3f4e09c172ad02aca7c5b767b1639d3 Mon Sep 17 00:00:00 2001
|
|
From: Namhyung Kim <namhyung@kernel.org>
|
|
Date: Tue, 15 Sep 2020 12:18:15 +0900
|
|
Subject: [PATCH 140/201] perf metric: Release expr_parse_ctx after testing
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc6
|
|
commit 437822bf38c1dc3bda6ffde52689e4e667046a6a
|
|
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=437822bf38c1dc3bda6ffde52689e4e667046a6a
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
The test_generic_metric() missed to release entries in the pctx. Asan
|
|
reported following leak (and more):
|
|
|
|
Direct leak of 128 byte(s) in 1 object(s) allocated from:
|
|
#0 0x7f4c9396980e in calloc (/lib/x86_64-linux-gnu/libasan.so.5+0x10780e)
|
|
#1 0x55f7e748cc14 in hashmap_grow (/home/namhyung/project/linux/tools/perf/perf+0x90cc14)
|
|
#2 0x55f7e748d497 in hashmap__insert (/home/namhyung/project/linux/tools/perf/perf+0x90d497)
|
|
#3 0x55f7e7341667 in hashmap__set /home/namhyung/project/linux/tools/perf/util/hashmap.h:111
|
|
#4 0x55f7e7341667 in expr__add_ref util/expr.c:120
|
|
#5 0x55f7e7292436 in prepare_metric util/stat-shadow.c:783
|
|
#6 0x55f7e729556d in test_generic_metric util/stat-shadow.c:858
|
|
#7 0x55f7e712390b in compute_single tests/parse-metric.c:128
|
|
#8 0x55f7e712390b in __compute_metric tests/parse-metric.c:180
|
|
#9 0x55f7e712446d in compute_metric tests/parse-metric.c:196
|
|
#10 0x55f7e712446d in test_dcache_l2 tests/parse-metric.c:295
|
|
#11 0x55f7e712446d in test__parse_metric tests/parse-metric.c:355
|
|
#12 0x55f7e70be09b in run_test tests/builtin-test.c:410
|
|
#13 0x55f7e70be09b in test_and_print tests/builtin-test.c:440
|
|
#14 0x55f7e70c101a in __cmd_test tests/builtin-test.c:661
|
|
#15 0x55f7e70c101a in cmd_test tests/builtin-test.c:807
|
|
#16 0x55f7e7126214 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:312
|
|
#17 0x55f7e6fc41a8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:364
|
|
#18 0x55f7e6fc41a8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:408
|
|
#19 0x55f7e6fc41a8 in main /home/namhyung/project/linux/tools/perf/perf.c:538
|
|
#20 0x7f4c93492cc9 in __libc_start_main ../csu/libc-start.c:308
|
|
|
|
Fixes: 6d432c4c8aa56 ("perf tools: Add test_generic_metric function")
|
|
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200915031819.386559-8-namhyung@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/stat-shadow.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
|
|
index 48a2a58e282f..5fe084048ed3 100644
|
|
--- a/tools/perf/util/stat-shadow.c
|
|
+++ b/tools/perf/util/stat-shadow.c
|
|
@@ -850,14 +850,16 @@ static void generic_metric(struct perf_stat_config *config,
|
|
double test_generic_metric(struct metric_expr *mexp, int cpu, struct runtime_stat *st)
|
|
{
|
|
struct expr_parse_ctx pctx;
|
|
- double ratio;
|
|
+ double ratio = 0.0;
|
|
|
|
if (prepare_metric(mexp->metric_events, mexp->metric_refs, &pctx, cpu, st) < 0)
|
|
- return 0.;
|
|
+ goto out;
|
|
|
|
if (expr__parse(&ratio, &pctx, mexp->metric_expr, 1))
|
|
- return 0.;
|
|
+ ratio = 0.0;
|
|
|
|
+out:
|
|
+ expr__ctx_clear(&pctx);
|
|
return ratio;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|