[email protected]>, Frederic Weisbecker <[email protected]>, Len Brown <[email protected]>, [email protected], Sascha Hauer <[email protected]>, Vasily Gorbik <[email protected]>, linux-arm-msm <[email protected]>, [email protected], linux-m68k <[email protected]>, Stafford Horne <[email protected]>, Linux ARM <[email protected]>, Chris Zankel <[email protected]>, Stephen Boyd <[email protected]>, [email protected], Daniel Bristot de Oliveira <[email protected]>, Alexander Shishkin <[email protected]>, Lorenzo Pieralisi <[email protected]>, Rasmus Villemoes <[email protected]>, Joel Fernandes <[email protected]>, Will Deacon <[email protected]>, Boris Ostrovsky <[email protected]>, Kevin Hilman <[email protected]>, [email protected], [email protected], [email protected], Mel Gorman <[email protected]>, Jacob Pan <[email protected] l.com>, Arnd Bergmann <[email protected]>, [email protected], [email protected], linux-clk <[email protected]>, Josh Triplett <[email protected]>, Steven Rostedt <[email protected]>, [email protected], Borislav Petkov <[email protected]>, [email protected], Thomas Bogendoerfer <[email protected]>, Parisc List <[email protected]>, Sudeep Holla <[email protected]>, Shawn Guo <[email protected]>, David Miller <[email protected]>, Rich Felker <[email protected]>, Tony Lindgren <[email protected]>, [email protected], Bjorn Andersson <[email protected]>, "H. Peter Anvin" <[email protected]>, [email protected], [email protected], linux-riscv <[email protected]>, [email protected], [email protected], Yury Norov <[email protected]>, Richard Weinberger <[email protected]>, the arch/x86 maintainers <[email protected]>, Russell King - ARM Linux <[email protected]>, Ingo Molnar <[email protected]>, Al bert Ou <[email protected]>, "Paul E. McKenney" < [email protected]>, Heiko Carstens <[email protected]>, [email protected], [email protected], Paul Walmsley <[email protected]>, linux-tegra <[email protected]>, [email protected], Andy Shevchenko <[email protected]>, [email protected], Juergen Gross <[email protected]>, Michal Simek <[email protected]>, "open list:BROADCOM NVRAM DRIVER" <[email protected]>, Palmer Dabbelt <[email protected]>, Anup Patel <[email protected]>, [email protected], Johannes Berg <[email protected]>, linuxppc-dev <[email protected]> Errors-To: [email protected] Sender: "Linuxppc-dev" <[email protected]>
On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra <[email protected]> wrote: > > Make cpuidle_enter_state() consistent with the s2idle variant and > verify ->enter() always returns with interrupts disabled. > > Signed-off-by: Peter Zijlstra (Intel) <[email protected]> > --- > drivers/cpuidle/cpuidle.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > --- a/drivers/cpuidle/cpuidle.c > +++ b/drivers/cpuidle/cpuidle.c > @@ -234,7 +234,11 @@ int cpuidle_enter_state(struct cpuidle_d > stop_critical_timings(); > if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE)) > rcu_idle_enter(); > + > entered_state = target_state->enter(dev, drv, index); > + if (WARN_ONCE(!irqs_disabled(), "%ps leaked IRQ state", > target_state->enter)) I'm not sure if dumping a call trace here is really useful and WARN_ON() often gets converted to panic(). I would print an error message with pr_warn_once(). Otherwise LGTM. > + raw_local_irq_disable(); > + > if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE)) > rcu_idle_exit(); > start_critical_timings(); > @@ -246,12 +250,8 @@ int cpuidle_enter_state(struct cpuidle_d > /* 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(); > >
