mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 21:52:04 +00:00
f2c3202ba0
The evlist and the cpu/thread maps should be released together. Otherwise following error was reported by Asan. $ perf test -v 28 28: Use a dummy software event to keep tracking: --- start --- test child forked, pid 156810 mmap size 528384B ================================================================= ==156810==ERROR: LeakSanitizer: detected memory leaks Direct leak of 40 byte(s) in 1 object(s) allocated from: #0 0x7f637d2bce8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145 #1 0x55cc6295cffa in cpu_map__trim_new /home/namhyung/project/linux/tools/lib/perf/cpumap.c:79 #2 0x55cc6295da1f in perf_cpu_map__read /home/namhyung/project/linux/tools/lib/perf/cpumap.c:149 #3 0x55cc6295e1df in cpu_map__read_all_cpu_map /home/namhyung/project/linux/tools/lib/perf/cpumap.c:166 #4 0x55cc6295e1df in perf_cpu_map__new /home/namhyung/project/linux/tools/lib/perf/cpumap.c:181 #5 0x55cc626287cf in test__keep_tracking tests/keep-tracking.c:84 #6 0x55cc625e38fb in run_test tests/builtin-test.c:428 #7 0x55cc625e38fb in test_and_print tests/builtin-test.c:458 #8 0x55cc625e5a53 in __cmd_test tests/builtin-test.c:679 #9 0x55cc625e5a53 in cmd_test tests/builtin-test.c:825 #10 0x55cc62651cc4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 #11 0x55cc624dba88 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 #12 0x55cc624dba88 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 #13 0x55cc624dba88 in main /home/namhyung/project/linux/tools/perf/perf.c:539 #14 0x7f637cdf2d09 in __libc_start_main ../csu/libc-start.c:308 SUMMARY: AddressSanitizer: 72 byte(s) leaked in 2 allocation(s). test child finished with 1 ---- end ---- Use a dummy software event to keep tracking: FAILED! Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: https://lore.kernel.org/r/20210301140409.184570-7-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
163 lines
3.6 KiB
C
163 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/types.h>
|
|
#include <limits.h>
|
|
#include <unistd.h>
|
|
#include <sys/prctl.h>
|
|
#include <perf/cpumap.h>
|
|
#include <perf/evlist.h>
|
|
#include <perf/mmap.h>
|
|
|
|
#include "debug.h"
|
|
#include "parse-events.h"
|
|
#include "evlist.h"
|
|
#include "evsel.h"
|
|
#include "record.h"
|
|
#include "thread_map.h"
|
|
#include "tests.h"
|
|
#include "util/mmap.h"
|
|
|
|
#define CHECK__(x) { \
|
|
while ((x) < 0) { \
|
|
pr_debug(#x " failed!\n"); \
|
|
goto out_err; \
|
|
} \
|
|
}
|
|
|
|
#define CHECK_NOT_NULL__(x) { \
|
|
while ((x) == NULL) { \
|
|
pr_debug(#x " failed!\n"); \
|
|
goto out_err; \
|
|
} \
|
|
}
|
|
|
|
static int find_comm(struct evlist *evlist, const char *comm)
|
|
{
|
|
union perf_event *event;
|
|
struct mmap *md;
|
|
int i, found;
|
|
|
|
found = 0;
|
|
for (i = 0; i < evlist->core.nr_mmaps; i++) {
|
|
md = &evlist->mmap[i];
|
|
if (perf_mmap__read_init(&md->core) < 0)
|
|
continue;
|
|
while ((event = perf_mmap__read_event(&md->core)) != NULL) {
|
|
if (event->header.type == PERF_RECORD_COMM &&
|
|
(pid_t)event->comm.pid == getpid() &&
|
|
(pid_t)event->comm.tid == getpid() &&
|
|
strcmp(event->comm.comm, comm) == 0)
|
|
found += 1;
|
|
perf_mmap__consume(&md->core);
|
|
}
|
|
perf_mmap__read_done(&md->core);
|
|
}
|
|
return found;
|
|
}
|
|
|
|
/**
|
|
* test__keep_tracking - test using a dummy software event to keep tracking.
|
|
*
|
|
* This function implements a test that checks that tracking events continue
|
|
* when an event is disabled but a dummy software event is not disabled. If the
|
|
* test passes %0 is returned, otherwise %-1 is returned.
|
|
*/
|
|
int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct record_opts opts = {
|
|
.mmap_pages = UINT_MAX,
|
|
.user_freq = UINT_MAX,
|
|
.user_interval = ULLONG_MAX,
|
|
.target = {
|
|
.uses_mmap = true,
|
|
},
|
|
};
|
|
struct perf_thread_map *threads = NULL;
|
|
struct perf_cpu_map *cpus = NULL;
|
|
struct evlist *evlist = NULL;
|
|
struct evsel *evsel = NULL;
|
|
int found, err = -1;
|
|
const char *comm;
|
|
|
|
threads = thread_map__new(-1, getpid(), UINT_MAX);
|
|
CHECK_NOT_NULL__(threads);
|
|
|
|
cpus = perf_cpu_map__new(NULL);
|
|
CHECK_NOT_NULL__(cpus);
|
|
|
|
evlist = evlist__new();
|
|
CHECK_NOT_NULL__(evlist);
|
|
|
|
perf_evlist__set_maps(&evlist->core, cpus, threads);
|
|
|
|
CHECK__(parse_events(evlist, "dummy:u", NULL));
|
|
CHECK__(parse_events(evlist, "cycles:u", NULL));
|
|
|
|
evlist__config(evlist, &opts, NULL);
|
|
|
|
evsel = evlist__first(evlist);
|
|
|
|
evsel->core.attr.comm = 1;
|
|
evsel->core.attr.disabled = 1;
|
|
evsel->core.attr.enable_on_exec = 0;
|
|
|
|
if (evlist__open(evlist) < 0) {
|
|
pr_debug("Unable to open dummy and cycles event\n");
|
|
err = TEST_SKIP;
|
|
goto out_err;
|
|
}
|
|
|
|
CHECK__(evlist__mmap(evlist, UINT_MAX));
|
|
|
|
/*
|
|
* First, test that a 'comm' event can be found when the event is
|
|
* enabled.
|
|
*/
|
|
|
|
evlist__enable(evlist);
|
|
|
|
comm = "Test COMM 1";
|
|
CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
|
|
|
|
evlist__disable(evlist);
|
|
|
|
found = find_comm(evlist, comm);
|
|
if (found != 1) {
|
|
pr_debug("First time, failed to find tracking event.\n");
|
|
goto out_err;
|
|
}
|
|
|
|
/*
|
|
* Secondly, test that a 'comm' event can be found when the event is
|
|
* disabled with the dummy event still enabled.
|
|
*/
|
|
|
|
evlist__enable(evlist);
|
|
|
|
evsel = evlist__last(evlist);
|
|
|
|
CHECK__(evsel__disable(evsel));
|
|
|
|
comm = "Test COMM 2";
|
|
CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
|
|
|
|
evlist__disable(evlist);
|
|
|
|
found = find_comm(evlist, comm);
|
|
if (found != 1) {
|
|
pr_debug("Second time, failed to find tracking event.\n");
|
|
goto out_err;
|
|
}
|
|
|
|
err = 0;
|
|
|
|
out_err:
|
|
if (evlist) {
|
|
evlist__disable(evlist);
|
|
evlist__delete(evlist);
|
|
}
|
|
perf_cpu_map__put(cpus);
|
|
perf_thread_map__put(threads);
|
|
|
|
return err;
|
|
}
|