Commit 601b05ca authored May 27, 2020 by Eelco Chaudron Committed by Alexei Starovoitov Jun 01, 2020

libbpf: Fix perf_buffer__free() API for sparse allocs



In case the cpu_bufs are sparsely allocated they are not all
free'ed. These changes will fix this.

Fixes: fb84b822 ("libbpf: add perf buffer API")
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/159056888305.330763.9684536967379110349.stgit@ebuild


Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent ee103e9f

tools/lib/bpf/libbpf.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -8137,9 +8137,12 @@ void perf_buffer__free(struct perf_buffer *pb)
		if (!pb)
		return;
		if (pb->cpu_bufs) {
		for (i = 0; i < pb->cpu_cnt && pb->cpu_bufs[i]; i++) {
		for (i = 0; i < pb->cpu_cnt; i++) {
		struct perf_cpu_buf *cpu_buf = pb->cpu_bufs[i];

		if (!cpu_buf)
		continue;

		bpf_map_delete_elem(pb->map_fd, &cpu_buf->map_key);
		perf_buffer__free_cpu_buf(pb, cpu_buf);
		}

Admin message