mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Namhyung Kim](/assets/img/avatar_default.png)
The evlist has the maps with its own refcounts so we don't need to set the pointers to NULL. Otherwise following error was reported by Asan. Also change the goto label since it doesn't need to have two. # perf test -v 25 25: Software clock events period values : --- start --- test child forked, pid 149154 mmap size 528384B mmap size 528384B ================================================================= ==149154==ERROR: LeakSanitizer: detected memory leaks Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0x7fef5cd071f8 in __interceptor_realloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:164 #1 0x56260d5e8b8e in perf_thread_map__realloc /home/namhyung/project/linux/tools/lib/perf/threadmap.c:23 #2 0x56260d3df7a9 in thread_map__new_by_tid util/thread_map.c:63 #3 0x56260d2ac6b2 in __test__sw_clock_freq tests/sw-clock.c:65 #4 0x56260d26d8fb in run_test tests/builtin-test.c:428 #5 0x56260d26d8fb in test_and_print tests/builtin-test.c:458 #6 0x56260d26fa53 in __cmd_test tests/builtin-test.c:679 #7 0x56260d26fa53 in cmd_test tests/builtin-test.c:825 #8 0x56260d2dbb64 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 #9 0x56260d165a88 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 #10 0x56260d165a88 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 #11 0x56260d165a88 in main /home/namhyung/project/linux/tools/perf/perf.c:539 #12 0x7fef5c83cd09 in __libc_start_main ../csu/libc-start.c:308 ... test child finished with 1 ---- end ---- Software clock events period values : 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-5-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
145 lines
3.2 KiB
C
145 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <errno.h>
|
|
#include <inttypes.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
#include <sys/mman.h>
|
|
#include <linux/string.h>
|
|
|
|
#include "tests.h"
|
|
#include "util/debug.h"
|
|
#include "util/evsel.h"
|
|
#include "util/evlist.h"
|
|
#include "util/cpumap.h"
|
|
#include "util/mmap.h"
|
|
#include "util/thread_map.h"
|
|
#include <perf/evlist.h>
|
|
#include <perf/mmap.h>
|
|
|
|
#define NR_LOOPS 10000000
|
|
|
|
/*
|
|
* This test will open software clock events (cpu-clock, task-clock)
|
|
* then check their frequency -> period conversion has no artifact of
|
|
* setting period to 1 forcefully.
|
|
*/
|
|
static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
|
|
{
|
|
int i, err = -1;
|
|
volatile int tmp = 0;
|
|
u64 total_periods = 0;
|
|
int nr_samples = 0;
|
|
char sbuf[STRERR_BUFSIZE];
|
|
union perf_event *event;
|
|
struct evsel *evsel;
|
|
struct evlist *evlist;
|
|
struct perf_event_attr attr = {
|
|
.type = PERF_TYPE_SOFTWARE,
|
|
.config = clock_id,
|
|
.sample_type = PERF_SAMPLE_PERIOD,
|
|
.exclude_kernel = 1,
|
|
.disabled = 1,
|
|
.freq = 1,
|
|
};
|
|
struct perf_cpu_map *cpus = NULL;
|
|
struct perf_thread_map *threads = NULL;
|
|
struct mmap *md;
|
|
|
|
attr.sample_freq = 500;
|
|
|
|
evlist = evlist__new();
|
|
if (evlist == NULL) {
|
|
pr_debug("evlist__new\n");
|
|
return -1;
|
|
}
|
|
|
|
evsel = evsel__new(&attr);
|
|
if (evsel == NULL) {
|
|
pr_debug("evsel__new\n");
|
|
goto out_delete_evlist;
|
|
}
|
|
evlist__add(evlist, evsel);
|
|
|
|
cpus = perf_cpu_map__dummy_new();
|
|
threads = thread_map__new_by_tid(getpid());
|
|
if (!cpus || !threads) {
|
|
err = -ENOMEM;
|
|
pr_debug("Not enough memory to create thread/cpu maps\n");
|
|
goto out_delete_evlist;
|
|
}
|
|
|
|
perf_evlist__set_maps(&evlist->core, cpus, threads);
|
|
|
|
if (evlist__open(evlist)) {
|
|
const char *knob = "/proc/sys/kernel/perf_event_max_sample_rate";
|
|
|
|
err = -errno;
|
|
pr_debug("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64 " in this test.\n",
|
|
str_error_r(errno, sbuf, sizeof(sbuf)),
|
|
knob, (u64)attr.sample_freq);
|
|
goto out_delete_evlist;
|
|
}
|
|
|
|
err = evlist__mmap(evlist, 128);
|
|
if (err < 0) {
|
|
pr_debug("failed to mmap event: %d (%s)\n", errno,
|
|
str_error_r(errno, sbuf, sizeof(sbuf)));
|
|
goto out_delete_evlist;
|
|
}
|
|
|
|
evlist__enable(evlist);
|
|
|
|
/* collect samples */
|
|
for (i = 0; i < NR_LOOPS; i++)
|
|
tmp++;
|
|
|
|
evlist__disable(evlist);
|
|
|
|
md = &evlist->mmap[0];
|
|
if (perf_mmap__read_init(&md->core) < 0)
|
|
goto out_init;
|
|
|
|
while ((event = perf_mmap__read_event(&md->core)) != NULL) {
|
|
struct perf_sample sample;
|
|
|
|
if (event->header.type != PERF_RECORD_SAMPLE)
|
|
goto next_event;
|
|
|
|
err = evlist__parse_sample(evlist, event, &sample);
|
|
if (err < 0) {
|
|
pr_debug("Error during parse sample\n");
|
|
goto out_delete_evlist;
|
|
}
|
|
|
|
total_periods += sample.period;
|
|
nr_samples++;
|
|
next_event:
|
|
perf_mmap__consume(&md->core);
|
|
}
|
|
perf_mmap__read_done(&md->core);
|
|
|
|
out_init:
|
|
if ((u64) nr_samples == total_periods) {
|
|
pr_debug("All (%d) samples have period value of 1!\n",
|
|
nr_samples);
|
|
err = -1;
|
|
}
|
|
|
|
out_delete_evlist:
|
|
perf_cpu_map__put(cpus);
|
|
perf_thread_map__put(threads);
|
|
evlist__delete(evlist);
|
|
return err;
|
|
}
|
|
|
|
int test__sw_clock_freq(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
int ret;
|
|
|
|
ret = __test__sw_clock_freq(PERF_COUNT_SW_CPU_CLOCK);
|
|
if (!ret)
|
|
ret = __test__sw_clock_freq(PERF_COUNT_SW_TASK_CLOCK);
|
|
|
|
return ret;
|
|
}
|