From 5bfc315baf02e3f3093c48af4ce7c798ea9778aa Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 3 Aug 2011 13:49:31 +0200 Subject: [PATCH] perf: overflow/perf_count_sw_cpu_clock crashes recent kernels 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 Signed-off-by: Peter Zijlstra Signed-off-by: Greg Kroah-Hartman [PG: backport from 2.6.32 queue, see https://lkml.org/lkml/2011/8/3/125 ] Signed-off-by: Paul Gortmaker --- kernel/perf_event.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index b203546f1ed2..540c26b0ab11 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -3907,12 +3907,8 @@ static int __perf_event_overflow(struct perf_event *event, int nmi, if (events && atomic_dec_and_test(&event->event_limit)) { ret = 1; event->pending_kill = POLL_HUP; - if (nmi) { - event->pending_disable = 1; - perf_pending_queue(&event->pending, - perf_pending_event); - } else - perf_event_disable(event); + event->pending_disable = 1; + perf_pending_queue(&event->pending, perf_pending_event); } if (event->overflow_handler) -- 2.39.5