ring-buffer: remove useless compile check for buffer_page size (0dcd4d6c) · Commits · 戴 / test

The original version of the ring buffer had a hack to map the page struct that held the pages of the buffer to also be the structure that the ring buffer would keep the pages in a link list. This overlap of the page struct was very dangerous and that hack was removed a while ago. But there was a check to make sure the buffer_page never became bigger than the page struct, and would fail the compile if it did. The check was only meaningful when we had the hack. Now that we have separate allocated descriptors for the buffer pages, we can remove this check. Signed-off-by:

Steven Rostedt <rostedt@goodmis.org>

kernel/trace/ring_buffer.c

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -620,12 +620,6 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
	kfree(cpu_buffer);		kfree(cpu_buffer);
	}		}

	/*
	* Causes compile errors if the struct buffer_page gets bigger
	* than the struct page.
	*/
	extern int ring_buffer_page_too_big(void);

	#ifdef CONFIG_HOTPLUG_CPU		#ifdef CONFIG_HOTPLUG_CPU
	static int rb_cpu_notify(struct notifier_block *self,		static int rb_cpu_notify(struct notifier_block *self,
	unsigned long action, void *hcpu);		unsigned long action, void *hcpu);
	@@ -648,11 +642,6 @@ struct ring_buffer *__ring_buffer_alloc(unsigned long size, unsigned flags,
	int bsize;		int bsize;
	int cpu;		int cpu;

	/* Paranoid! Optimizes out when all is well */
	if (sizeof(struct buffer_page) > sizeof(struct page))
	ring_buffer_page_too_big();


	/* keep it in its own cache line */		/* keep it in its own cache line */
	buffer = kzalloc(ALIGN(sizeof(*buffer), cache_line_size()),		buffer = kzalloc(ALIGN(sizeof(*buffer), cache_line_size()),
	GFP_KERNEL);		GFP_KERNEL);

Admin message