From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737AbbFHPNE (ORCPT ); Mon, 8 Jun 2015 11:13:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44692 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbbFHPM5 (ORCPT ); Mon, 8 Jun 2015 11:12:57 -0400 Date: Mon, 8 Jun 2015 17:11:56 +0200 From: Oleg Nesterov To: Peter Zijlstra Cc: umgwanakikbuti@gmail.com, mingo@elte.hu, ktkhai@parallels.com, rostedt@goodmis.org, tglx@linutronix.de, juri.lelli@gmail.com, pang.xunlei@linaro.org, wanpeng.li@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] hrtimer: fix the __hrtimer_start_range_ns() race with hrtimer_active() Message-ID: <20150608151156.GD23138@redhat.com> References: <20150605084836.364306429@infradead.org> <20150605085205.723058588@infradead.org> <20150607223317.GA5193@redhat.com> <20150608091417.GM19282@twins.programming.kicks-ass.net> <20150608141709.GX18673@twins.programming.kicks-ass.net> <20150608151039.GA23138@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150608151039.GA23138@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change __hrtimer_start_range_ns() to preserve ENQUEUED. --- kernel/time/hrtimer.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 5fceb3d..1761f96 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -902,8 +902,8 @@ out: /* * remove hrtimer, called with base lock held */ -static inline int -remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) +static inline int remove_hrtimer(struct hrtimer *timer, + struct hrtimer_clock_base *base, bool clear_enqueued) { if (hrtimer_is_queued(timer)) { int reprogram; @@ -923,7 +923,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) * This preserves the CALLBACK flag, otherwise we could move * the timer base in switch_hrtimer_base. */ - __remove_hrtimer(timer, base, true, reprogram); + __remove_hrtimer(timer, base, clear_enqueued, reprogram); return 1; } return 0; @@ -940,7 +940,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, base = lock_hrtimer_base(timer, &flags); /* Remove an active timer from the queue: */ - ret = remove_hrtimer(timer, base); + ret = remove_hrtimer(timer, base, false); if (mode & HRTIMER_MODE_REL) { tim = ktime_add_safe(tim, base->get_time()); @@ -1061,7 +1061,7 @@ int hrtimer_try_to_cancel(struct hrtimer *timer) base = lock_hrtimer_base(timer, &flags); if (!hrtimer_callback_running(timer)) - ret = remove_hrtimer(timer, base); + ret = remove_hrtimer(timer, base, true); unlock_hrtimer_base(timer, &flags); -- 1.5.5.1