From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: [PATCH RT 1/2] Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()" Date: Wed, 02 Jul 2014 21:34:10 -0400 Message-ID: <20140703013419.439517631@goodmis.org> References: <20140703013409.809031176@goodmis.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Thomas Gleixner , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker , stable-rt@vger.kernel.org, Ben Hutchings To: linux-kernel@vger.kernel.org, linux-rt-users Return-path: Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.229]:53594 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754004AbaGCBeY (ORCPT ); Wed, 2 Jul 2014 21:34:24 -0400 Content-Disposition: inline; filename=0001-Fix-latency-histogram-after-hrtimer-Set-expiry-time-.patch Sender: linux-rt-users-owner@vger.kernel.org List-ID: 3.4.94-rt117-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings In an rt-kernel with CONFIG_MISSED_TIMER_OFFSETS_HIST enabled, __hrtimer_start_range_ns() now crashes, as new_base is not assigned before it is used. Tested-by: Carsten Emde Cc: stable-rt@vger.kernel.org Signed-off-by: Ben Hutchings Signed-off-by: Steven Rostedt --- kernel/hrtimer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b62a3a7541c7..3f7d3b5b0717 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1038,6 +1038,11 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, #endif } + hrtimer_set_expires_range_ns(timer, tim, delta_ns); + + /* Switch the timer base, if necessary: */ + new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); + #ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST { ktime_t now = new_base->get_time(); @@ -1049,11 +1054,6 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, } #endif - hrtimer_set_expires_range_ns(timer, tim, delta_ns); - - /* Switch the timer base, if necessary: */ - new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);