From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: [PATCH RT 2/3] Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()" Date: Wed, 02 Jul 2014 15:52:22 -0400 Message-ID: <20140702195231.674381938@goodmis.org> References: <20140702195220.872585955@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.231]:30394 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754913AbaGBTwd (ORCPT ); Wed, 2 Jul 2014 15:52:33 -0400 Content-Disposition: inline; filename=0002-Fix-latency-histogram-after-hrtimer-Set-expiry-time-.patch Sender: linux-rt-users-owner@vger.kernel.org List-ID: 3.10.44-rt46-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 f7a3a7a5a61b..1defbda1def8 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1102,6 +1102,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(); @@ -1113,11 +1118,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); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757853AbaGBTxW (ORCPT ); Wed, 2 Jul 2014 15:53:22 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:42781 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754863AbaGBTwd (ORCPT ); Wed, 2 Jul 2014 15:52:33 -0400 Message-Id: <20140702195231.674381938@goodmis.org> User-Agent: quilt/0.63-1 Date: Wed, 02 Jul 2014 15:52:22 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-rt-users Cc: Thomas Gleixner , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker , stable-rt@vger.kernel.org, Ben Hutchings Subject: [PATCH RT 2/3] Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()" References: <20140702195220.872585955@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=0002-Fix-latency-histogram-after-hrtimer-Set-expiry-time-.patch X-RR-Connecting-IP: 107.14.168.142:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.10.44-rt46-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 f7a3a7a5a61b..1defbda1def8 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1102,6 +1102,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(); @@ -1113,11 +1118,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); - timer_stats_hrtimer_set_start_info(timer); leftmost = enqueue_hrtimer(timer, new_base); -- 2.0.0