[GIT PULL] perf fix (preempt count imbalance on buffer)

From: Frederic Weisbecker
Date: Thu May 20 2010 - 15:42:38 EST


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



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 <fweisbec@xxxxxxxxx>
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.

Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2a060be..45b7aec 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -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))

+ out:

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/