Browse Source

ring-buffer: do not reset while in a commit

The callers of reset must ensure that no commit can be taking place
at the time of the reset. If it does then we may corrupt the ring buffer.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt 15 years ago
parent
commit
41b6a95d69
1 changed files with 4 additions and 0 deletions
  1. 4 0
      kernel/trace/ring_buffer.c

+ 4 - 0
kernel/trace/ring_buffer.c

@@ -3373,12 +3373,16 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
 
 
 	spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
 	spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
 
 
+	if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))
+		goto out;
+
 	__raw_spin_lock(&cpu_buffer->lock);
 	__raw_spin_lock(&cpu_buffer->lock);
 
 
 	rb_reset_cpu(cpu_buffer);
 	rb_reset_cpu(cpu_buffer);
 
 
 	__raw_spin_unlock(&cpu_buffer->lock);
 	__raw_spin_unlock(&cpu_buffer->lock);
 
 
+ out:
 	spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 	spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
 
 	atomic_dec(&cpu_buffer->record_disabled);
 	atomic_dec(&cpu_buffer->record_disabled);