aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Weisbecker <frederic@kernel.org>2017-11-06 10:01:20 -0500
committerIngo Molnar <mingo@kernel.org>2017-11-08 05:13:49 -0500
commitebf3adbad012b89c4a51a3beae718a587d988a3a (patch)
tree477b81629c5b767a759d94befb11c69c972b9417
parent8e8eb730759f9cfd7a761b0b4ee41d714e720993 (diff)
timers/nohz: Use lockdep to assert IRQs are disabled/enabled
Use lockdep to check that IRQs are enabled or disabled as expected. This way the sanity check only shows overhead when concurrency correctness debug code is enabled. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: David S . Miller <davem@davemloft.net> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1509980490-4285-5-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/time/tick-sched.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index c7a899c5ce64..dd4b7b492c9b 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -198,7 +198,7 @@ static bool check_tick_dependency(atomic_t *dep)
198 198
199static bool can_stop_full_tick(int cpu, struct tick_sched *ts) 199static bool can_stop_full_tick(int cpu, struct tick_sched *ts)
200{ 200{
201 WARN_ON_ONCE(!irqs_disabled()); 201 lockdep_assert_irqs_disabled();
202 202
203 if (unlikely(!cpu_online(cpu))) 203 if (unlikely(!cpu_online(cpu)))
204 return false; 204 return false;
@@ -960,8 +960,7 @@ void tick_nohz_idle_enter(void)
960{ 960{
961 struct tick_sched *ts; 961 struct tick_sched *ts;
962 962
963 WARN_ON_ONCE(irqs_disabled()); 963 lockdep_assert_irqs_enabled();
964
965 /* 964 /*
966 * Update the idle state in the scheduler domain hierarchy 965 * Update the idle state in the scheduler domain hierarchy
967 * when tick_nohz_stop_sched_tick() is called from the idle loop. 966 * when tick_nohz_stop_sched_tick() is called from the idle loop.