From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031005Ab2CUN7k (ORCPT ); Wed, 21 Mar 2012 09:59:40 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:61813 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030946Ab2CUN7g (ORCPT ); Wed, 21 Mar 2012 09:59:36 -0400 From: Frederic Weisbecker To: LKML , linaro-sched-sig@lists.linaro.org Cc: Frederic Weisbecker , Alessio Igor Bogani , Andrew Morton , Avi Kivity , Chris Metcalf , Christoph Lameter , Daniel Lezcano , Geoff Levand , Gilad Ben Yossef , Ingo Molnar , Max Krasnyansky , "Paul E. McKenney" , Peter Zijlstra , Stephen Hemminger , Steven Rostedt , Sven-Thorsten Dietrich , Thomas Gleixner , Zen Lin Subject: [PATCH 13/32] nohz/cpuset: Don't stop the tick if posix cpu timers are running Date: Wed, 21 Mar 2012 14:58:19 +0100 Message-Id: <1332338318-5958-15-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1332338318-5958-1-git-send-email-fweisbec@gmail.com> References: <1332338318-5958-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If either a per thread or a per process posix cpu timer is running, don't stop the tick. TODO: restart the tick if it is stopped and a posix cpu timer is enqueued. Check we probably need a memory barrier for the per process posix timer that can be enqueued from another task of the group. Signed-off-by: Frederic Weisbecker Cc: Alessio Igor Bogani Cc: Andrew Morton Cc: Avi Kivity Cc: Chris Metcalf Cc: Christoph Lameter Cc: Daniel Lezcano Cc: Geoff Levand Cc: Gilad Ben Yossef Cc: Ingo Molnar Cc: Max Krasnyansky Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Stephen Hemminger Cc: Steven Rostedt Cc: Sven-Thorsten Dietrich Cc: Thomas Gleixner Cc: Zen Lin --- include/linux/posix-timers.h | 1 + kernel/posix-cpu-timers.c | 12 ++++++++++++ kernel/time/tick-sched.c | 4 ++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 042058f..97480c2 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -119,6 +119,7 @@ int posix_timer_event(struct k_itimer *timr, int si_private); void posix_cpu_timer_schedule(struct k_itimer *timer); void run_posix_cpu_timers(struct task_struct *task); +bool posix_cpu_timers_running(struct task_struct *tsk); void posix_cpu_timers_exit(struct task_struct *task); void posix_cpu_timers_exit_group(struct task_struct *task); diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 125cb67..79d4c24 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -1274,6 +1275,17 @@ static inline int fastpath_timer_check(struct task_struct *tsk) return 0; } +bool posix_cpu_timers_running(struct task_struct *tsk) +{ + if (!task_cputime_zero(&tsk->cputime_expires)) + return true; + + if (tsk->signal->cputimer.running) + return true; + + return false; +} + /* * This is called from the timer interrupt handler. The irq handler has * already updated our counts. We need to check if any timers fire now. diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 4f99766..fc35d41 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -512,6 +513,9 @@ static bool can_stop_adaptive_tick(void) if (!sched_can_stop_tick()) return false; + if (posix_cpu_timers_running(current)) + return false; + /* Is there a grace period to complete ? */ if (rcu_pending(smp_processor_id())) return false; -- 1.7.5.4