forked from luck/tmp_suning_uos_patched
a2f0da3af6
[ Upstream commit 244d1797c8c8e850b8de7992af713aa5c70d5650 ]
ASan reports a memory leak when running:
# perf test "65: maps__merge_in"
This is the second and final patch addressing these memory leaks.
This time, the problem is simply that the maps object is never
destructed.
This patch adds the missing maps__exit call.
Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Fixes: 79b6bb73f8 ("perf maps: Merge 'struct maps' with 'struct map_groups'")
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.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/a1a29b97a58738987d150e94d4ebfad0282fb038.1626343282.git.rickyman7@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
123 lines
3.1 KiB
C
123 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include <linux/kernel.h>
|
|
#include "tests.h"
|
|
#include "map.h"
|
|
#include "maps.h"
|
|
#include "dso.h"
|
|
#include "debug.h"
|
|
|
|
struct map_def {
|
|
const char *name;
|
|
u64 start;
|
|
u64 end;
|
|
};
|
|
|
|
static int check_maps(struct map_def *merged, unsigned int size, struct maps *maps)
|
|
{
|
|
struct map *map;
|
|
unsigned int i = 0;
|
|
|
|
maps__for_each_entry(maps, map) {
|
|
if (i > 0)
|
|
TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size));
|
|
|
|
TEST_ASSERT_VAL("wrong map start", map->start == merged[i].start);
|
|
TEST_ASSERT_VAL("wrong map end", map->end == merged[i].end);
|
|
TEST_ASSERT_VAL("wrong map name", !strcmp(map->dso->name, merged[i].name));
|
|
TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1);
|
|
|
|
i++;
|
|
}
|
|
|
|
return TEST_OK;
|
|
}
|
|
|
|
int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct maps maps;
|
|
unsigned int i;
|
|
struct map_def bpf_progs[] = {
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
};
|
|
struct map_def merged12[] = {
|
|
{ "kcore1", 100, 200 },
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "kcore1", 300, 500 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "kcore1", 600, 800 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
{ "kcore1", 900, 1000 },
|
|
};
|
|
struct map_def merged3[] = {
|
|
{ "kcore1", 100, 200 },
|
|
{ "bpf_prog_1", 200, 300 },
|
|
{ "kcore1", 300, 500 },
|
|
{ "bpf_prog_2", 500, 600 },
|
|
{ "kcore1", 600, 800 },
|
|
{ "bpf_prog_3", 800, 900 },
|
|
{ "kcore1", 900, 1000 },
|
|
{ "kcore3", 1000, 1100 },
|
|
};
|
|
struct map *map_kcore1, *map_kcore2, *map_kcore3;
|
|
int ret;
|
|
|
|
maps__init(&maps, NULL);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(bpf_progs); i++) {
|
|
struct map *map;
|
|
|
|
map = dso__new_map(bpf_progs[i].name);
|
|
TEST_ASSERT_VAL("failed to create map", map);
|
|
|
|
map->start = bpf_progs[i].start;
|
|
map->end = bpf_progs[i].end;
|
|
maps__insert(&maps, map);
|
|
map__put(map);
|
|
}
|
|
|
|
map_kcore1 = dso__new_map("kcore1");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore1);
|
|
|
|
map_kcore2 = dso__new_map("kcore2");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore2);
|
|
|
|
map_kcore3 = dso__new_map("kcore3");
|
|
TEST_ASSERT_VAL("failed to create map", map_kcore3);
|
|
|
|
/* kcore1 map overlaps over all bpf maps */
|
|
map_kcore1->start = 100;
|
|
map_kcore1->end = 1000;
|
|
|
|
/* kcore2 map hides behind bpf_prog_2 */
|
|
map_kcore2->start = 550;
|
|
map_kcore2->end = 570;
|
|
|
|
/* kcore3 map hides behind bpf_prog_3, kcore1 and adds new map */
|
|
map_kcore3->start = 880;
|
|
map_kcore3->end = 1100;
|
|
|
|
ret = maps__merge_in(&maps, map_kcore1);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = maps__merge_in(&maps, map_kcore2);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
ret = maps__merge_in(&maps, map_kcore3);
|
|
TEST_ASSERT_VAL("failed to merge map", !ret);
|
|
|
|
ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps);
|
|
TEST_ASSERT_VAL("merge check failed", !ret);
|
|
|
|
maps__exit(&maps);
|
|
return TEST_OK;
|
|
}
|