This is a note to let you know that I've just added the patch titled
perf: Fix software event overflow
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-fix-software-event-overflow.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Tue Aug 2 09:32:36 2011
From: Peter Zijlstra <[email protected]>
Date: Thu, 28 Jul 2011 20:47:10 +0200
Subject: perf: Fix software event overflow
To: Vince Weaver <[email protected]>
Cc: Ingo Molnar <[email protected]>, Paul Mackerras <[email protected]>,
[email protected], Arnaldo Carvalho de Melo
<[email protected]>, stable <[email protected]>
Message-ID: <1311878830.2617.373.camel@laptop>
From: Peter Zijlstra <[email protected]>
The below patch is for -stable only, upstream has a much larger patch
that contains the below hunk in commit a8b0ca17b80e92faab46ee7179ba9e99ccb61233
Vince found that under certain circumstances software event overflows
go wrong and deadlock. Avoid trying to delete a timer from the timer
callback.
Reported-by: Vince Weaver <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
kernel/events/core.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5016,11 +5016,8 @@ static int __perf_event_overflow(struct
if (events && atomic_dec_and_test(&event->event_limit)) {
ret = 1;
event->pending_kill = POLL_HUP;
- if (nmi) {
- event->pending_disable = 1;
- irq_work_queue(&event->pending);
- } else
- perf_event_disable(event);
+ event->pending_disable = 1;
+ irq_work_queue(&event->pending);
}
if (event->overflow_handler)
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/irq_work-ppc-fix-up-arch-hooks.patch
queue-3.0/perf-tools-x86-fix-32-bit-compile-on-64-bit-system.patch
queue-3.0/perf-fix-software-event-overflow.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
