Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e13e74f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "trace: Fix race in trace_open and buffer resize call"

parents 74fea8b6 15911b86

kernel/trace/ring_buffer.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -4405,6 +4405,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) 




	if (!cpumask_test_cpu(cpu, buffer->cpumask))

	if (!cpumask_test_cpu(cpu, buffer->cpumask))

		return;

		return;

	/* prevent another thread from changing buffer sizes */

	mutex_lock(&buffer->mutex);





	atomic_inc(&buffer->resize_disabled);

	atomic_inc(&buffer->resize_disabled);

	atomic_inc(&cpu_buffer->record_disabled);

	atomic_inc(&cpu_buffer->record_disabled);
@@ -4428,6 +4430,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) 




	atomic_dec(&cpu_buffer->record_disabled);

	atomic_dec(&cpu_buffer->record_disabled);

	atomic_dec(&buffer->resize_disabled);

	atomic_dec(&buffer->resize_disabled);



	mutex_unlock(&buffer->mutex);

}

}

EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu);

EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu);