Commit 9483409a authored by Namhyung Kim's avatar Namhyung Kim Committed by Peter Zijlstra
Browse files

perf core: Allocate perf_buffer in the target node memory 



I found the ring buffer pages are allocated in the node but the ring
buffer itself is not.  Let's convert it to use kzalloc_node() too.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210315033436.682438-1-namhyung@kernel.org
parent 1e28eed1

kernel/events/ring_buffer.c

+6 −3
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) 
{

	struct perf_buffer *rb;

	unsigned long size;

	int i;

	int i, node;



	size = sizeof(struct perf_buffer);

	size += nr_pages * sizeof(void *);
@@ -812,7 +812,8 @@ struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) 
	if (order_base_2(size) >= PAGE_SHIFT+MAX_ORDER)

		goto fail;



	rb = kzalloc(size, GFP_KERNEL);

	node = (cpu == -1) ? cpu : cpu_to_node(cpu);

	rb = kzalloc_node(size, GFP_KERNEL, node);

	if (!rb)

		goto fail;
@@ -906,11 +907,13 @@ struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) 
	struct perf_buffer *rb;

	unsigned long size;

	void *all_buf;

	int node;



	size = sizeof(struct perf_buffer);

	size += sizeof(void *);



	rb = kzalloc(size, GFP_KERNEL);

	node = (cpu == -1) ? cpu : cpu_to_node(cpu);

	rb = kzalloc_node(size, GFP_KERNEL, node);

	if (!rb)

		goto fail;