mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-08 23:14:51 +09:00
05804a7d22
[ Upstream commit fc56f54f6fcd5337634f4545af6459613129b432 ]
ASan reports a memory leak when running:
# perf test "49: Synthesize attr update"
Caused by evlist not being deleted.
This patch adds the missing evlist__delete and removes the
perf_cpu_map__put since it's already being deleted by evlist__delete.
Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Fixes: a6e5281780 ("perf tools: Add event_update event unit type")
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/f7994ad63d248f7645f901132d208fadf9f2b7e4.1626343282.git.rickyman7@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
125 lines
3.9 KiB
C
125 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include <perf/cpumap.h>
|
|
#include <string.h>
|
|
#include "cpumap.h"
|
|
#include "evlist.h"
|
|
#include "evsel.h"
|
|
#include "header.h"
|
|
#include "machine.h"
|
|
#include "util/synthetic-events.h"
|
|
#include "tool.h"
|
|
#include "tests.h"
|
|
#include "debug.h"
|
|
|
|
static int process_event_unit(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
|
|
|
|
TEST_ASSERT_VAL("wrong id", ev->id == 123);
|
|
TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__UNIT);
|
|
TEST_ASSERT_VAL("wrong unit", !strcmp(ev->data, "KRAVA"));
|
|
return 0;
|
|
}
|
|
|
|
static int process_event_scale(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
|
|
struct perf_record_event_update_scale *ev_data;
|
|
|
|
ev_data = (struct perf_record_event_update_scale *)ev->data;
|
|
|
|
TEST_ASSERT_VAL("wrong id", ev->id == 123);
|
|
TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__SCALE);
|
|
TEST_ASSERT_VAL("wrong scale", ev_data->scale == 0.123);
|
|
return 0;
|
|
}
|
|
|
|
struct event_name {
|
|
struct perf_tool tool;
|
|
const char *name;
|
|
};
|
|
|
|
static int process_event_name(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct event_name *tmp = container_of(tool, struct event_name, tool);
|
|
struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
|
|
|
|
TEST_ASSERT_VAL("wrong id", ev->id == 123);
|
|
TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__NAME);
|
|
TEST_ASSERT_VAL("wrong name", !strcmp(ev->data, tmp->name));
|
|
return 0;
|
|
}
|
|
|
|
static int process_event_cpus(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
|
|
struct perf_record_event_update_cpus *ev_data;
|
|
struct perf_cpu_map *map;
|
|
|
|
ev_data = (struct perf_record_event_update_cpus *) ev->data;
|
|
|
|
map = cpu_map__new_data(&ev_data->cpus);
|
|
|
|
TEST_ASSERT_VAL("wrong id", ev->id == 123);
|
|
TEST_ASSERT_VAL("wrong type", ev->type == PERF_EVENT_UPDATE__CPUS);
|
|
TEST_ASSERT_VAL("wrong cpus", map->nr == 3);
|
|
TEST_ASSERT_VAL("wrong cpus", map->map[0] == 1);
|
|
TEST_ASSERT_VAL("wrong cpus", map->map[1] == 2);
|
|
TEST_ASSERT_VAL("wrong cpus", map->map[2] == 3);
|
|
perf_cpu_map__put(map);
|
|
return 0;
|
|
}
|
|
|
|
int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct evlist *evlist;
|
|
struct evsel *evsel;
|
|
struct event_name tmp;
|
|
|
|
evlist = perf_evlist__new_default();
|
|
TEST_ASSERT_VAL("failed to get evlist", evlist);
|
|
|
|
evsel = evlist__first(evlist);
|
|
|
|
TEST_ASSERT_VAL("failed to allocate ids",
|
|
!perf_evsel__alloc_id(&evsel->core, 1, 1));
|
|
|
|
perf_evlist__id_add(&evlist->core, &evsel->core, 0, 0, 123);
|
|
|
|
evsel->unit = strdup("KRAVA");
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize attr update unit",
|
|
!perf_event__synthesize_event_update_unit(NULL, evsel, process_event_unit));
|
|
|
|
evsel->scale = 0.123;
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize attr update scale",
|
|
!perf_event__synthesize_event_update_scale(NULL, evsel, process_event_scale));
|
|
|
|
tmp.name = perf_evsel__name(evsel);
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize attr update name",
|
|
!perf_event__synthesize_event_update_name(&tmp.tool, evsel, process_event_name));
|
|
|
|
evsel->core.own_cpus = perf_cpu_map__new("1,2,3");
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize attr update cpus",
|
|
!perf_event__synthesize_event_update_cpus(&tmp.tool, evsel, process_event_cpus));
|
|
|
|
evlist__delete(evlist);
|
|
return 0;
|
|
}
|