From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lingutla Chandrasekhar Subject: [PATCH v2] timer: Forward timer base before migrating timers Date: Thu, 18 Jan 2018 17:20:22 +0530 Message-ID: <20180118115022.6368-1-clingutla@codeaurora.org> Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:36566 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754855AbeARLvQ (ORCPT ); Thu, 18 Jan 2018 06:51:16 -0500 Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, neeraju@codeaurora.org, linux-arm-msm@vger.kernel.org, Lingutla Chandrasekhar In case when timers are migrated to a CPU, after it exits idle, but before timer base is forwarded, either from run_timer_softirq()/mod_timer()/add_timer_on(), it's possible that migrated timers are queued, based on older clock value. This can cause delays in handling those timers. For example, consider below sequence of events: - CPU0 timer1 expires = 59969 and base->clk = 59131. So, timer is queued at level 2, with next expiry for this timer = 60032 (due to granularity addition). - CPU1 enters idle @60007, with next timer expiry @60020. - CPU1 exits idle. - CPU0 is hotplugged at 60009, and timers are migrated to CPU1, with new base->clk = 60007. timer1 is queued, based on 60007 at level 0, for immediate handling (in next timer softirq handling). - CPU1's base->clk is forwarded to 60009, so, in next sched timer interrupt, timer1 is not handled. The issue happens as timer wheel collects expired timers starting from the current clk's index onwards, but migrated timers, if enqueued, based on older clk value can result in their index being less than clk's current index. This can only happen if new base->clk is ahead of timer->expires, resulting in timer being queued at new base->clk's current index. Co-developed-by: Neeraj Upadhyay Signed-off-by: Neeraj Upadhyay Signed-off-by: Lingutla Chandrasekhar diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 89a9e1b4264a..f66c7ad55d7a 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1886,6 +1886,12 @@ int timers_dead_cpu(unsigned int cpu) raw_spin_lock_irq(&new_base->lock); raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING); + /* + * Before migrating timers, update new base clk to avoid + * queueing timers based on older clock value. + */ + forward_timer_base(new_base); + BUG_ON(old_base->running_timer); for (i = 0; i < WHEEL_SIZE; i++) -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.