Commit 077c5407 authored Sep 03, 2009 by Steven Rostedt Committed by Steven Rostedt Sep 04, 2009

ring-buffer: disable all cpu buffers when one finds a problem



Currently the way RB_WARN_ON works, is to disable either the current
CPU buffer or all CPU buffers, depending on whether a ring_buffer or
ring_buffer_per_cpu struct was passed into the macro.

Most users of the RB_WARN_ON pass in the CPU buffer, so only the one
CPU buffer gets disabled but the rest are still active. This may
confuse users even though a warning is sent to the console.

This patch changes the macro to disable the entire buffer even if
the CPU buffer is passed in.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent a1863c21

kernel/trace/ring_buffer.c

+13 −8

Original line number	Diff line number	Diff line
		@@ -467,11 +467,16 @@ struct ring_buffer_iter {
		};

		/* buffer may be either ring_buffer or ring_buffer_per_cpu */
		#define RB_WARN_ON(buffer, cond) \
		#define RB_WARN_ON(b, cond) \
		({ \
		int _____ret = unlikely(cond); \
		if (_____ret) { \
		atomic_inc(&buffer->record_disabled); \
		if (__same_type(*(b), struct ring_buffer_per_cpu)) { \
		struct ring_buffer_per_cpu *__b = \
		(void *)b; \
		atomic_inc(&__b->buffer->record_disabled); \
		} else \
		atomic_inc(&b->record_disabled); \
		WARN_ON(1); \
		} \
		_____ret; \

Admin message