cpuidle: Move IRQ state validation

Make cpuidle_enter_state() consistent with the s2idle variant and
verify ->enter() always returns with interrupts disabled.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195539.576412812@infradead.org

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 6eceb19..95c801f 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -236,7 +236,11 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
        stop_critical_timings();
        if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE))
                ct_idle_enter();
+
        entered_state = target_state->enter(dev, drv, index);
+       if (WARN_ONCE(!irqs_disabled(), "%ps leaked IRQ state", target_state->enter))
+               raw_local_irq_disable();
+
        if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE))
                ct_idle_exit();
        start_critical_timings();
@@ -248,12 +252,8 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
        /* The cpu is no longer idle or about to enter idle. */
        sched_idle_set_state(NULL);
 
-       if (broadcast) {
-               if (WARN_ON_ONCE(!irqs_disabled()))
-                       local_irq_disable();
-
+       if (broadcast)
                tick_broadcast_exit();
-       }
 
        if (!cpuidle_state_is_coupled(drv, index))
                local_irq_enable();