Commit c8dd6ee5 authored Dec 05, 2018 by Alexey Budankov Committed by Arnaldo Carvalho de Melo Dec 17, 2018

perf record: Fix memory leak on AIO objects deallocation



Sending a part which was missed between v12 and v13 of the patch set
introducing AIO trace streaming for perf record mode.

The part is essential to avoid memory leakage during deallocation of AIO
related trace data buffers.

Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/e5d3154e-1583-83bb-9527-28ddbc6dbf9d@linux.intel.com


[ No need to test for NULL before calling zfree() ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 91b2b970

tools/perf/util/mmap.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -207,8 +207,14 @@ static int perf_mmap__aio_mmap(struct perf_mmap map, struct mmap_params mp)

		static void perf_mmap__aio_munmap(struct perf_mmap *map)
		{
		int i;

		for (i = 0; i < map->aio.nr_cblocks; ++i)
		zfree(&map->aio.data[i]);
		if (map->aio.data)
		zfree(&map->aio.data);
		zfree(&map->aio.cblocks);
		zfree(&map->aio.aiocb);
		}

		int perf_mmap__aio_push(struct perf_mmap md, void to, int idx,

Admin message