Skip to contentSkip to conversation

perf fix (preempt count imbalance on buffer)

GIT PULL Frederic Weisbecker 1 participant 1 message May 20, 2010

lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the perf/core branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/core

Thanks,
Frederic
---

Frederic Weisbecker (1):
perf: Fix forgotten preempt_enable by nested writers

 kernel/perf_event.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

---
commit acd35a463cb2a8d2b28e094d718cf6e653ad7191

Author: Frederic Weisbecker <[email protected]>
Date:   Thu May 20 21:28:34 2010 +0200

perf: Fix forgotten preempt_enable by nested writers

A writer that gets a reference to the buffer handle disables preemption. When we put that reference, we check if we are the outer most writer and if not, we simply return and defer the head update to the outer most writer. The problem here is that preemption is only reenabled by the outer most, that produces preemption count imbalance for every nested writer that exit.

So just don't forget to always re-enable preemption when we put the buffer reference, whoever we are.

Fixes lots of sleeping in atomic warnings, visible with lock events recording.

Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Robert Richter <[email protected]>
kernel/perf_event.c +2 -1
index 2a060be..45b7aec 100644
@@ -2933,7 +2933,7 @@ again:
 	 */
 
 	if (!local_dec_and_test(&data->nest))
-		return;
+		goto out;
 
 	/*
 	 * Publish the known good head. Rely on the full barrier implied
@@ -2954,6 +2954,7 @@ again:
 	if (handle->wakeup != local_read(&data->wakeup))
 		perf_output_wakeup(handle);
 
+ out:
 	preempt_enable();
 }