ieu.desnoy...@efficios.com>, Frederic Weisbecker <frede...@kernel.org>, Len
Brown <l...@kernel.org>, linux-xte...@linux-xtensa.org, Sascha Hauer
<ker...@pengutronix.de>, Vasily Gorbik <g...@linux.ibm.com>, linux-arm-msm
<linux-arm-...@vger.kernel.org>, linux-al...@vger.kernel.org, linux-m68k
<linux-m...@lists.linux-m68k.org>, Stafford Horne <sho...@gmail.com>, Linux ARM
<linux-arm-ker...@lists.infradead.org>, Chris Zankel <ch...@zankel.net>,
Stephen Boyd <sb...@kernel.org>, dingu...@kernel.org, Daniel Bristot de
Oliveira <bris...@redhat.com>, Alexander Shishkin
<alexander.shish...@linux.intel.com>, Lorenzo Pieralisi
<lpieral...@kernel.org>, Rasmus Villemoes <li...@rasmusvillemoes.dk>, Joel
Fernandes <j...@joelfernandes.org>, Will Deacon <w...@kernel.org>, Boris
Ostrovsky <boris.ostrov...@oracle.com>, Kevin Hilman <khil...@kernel.org>,
linux-c...@vger.kernel.org, pv-driv...@vmware.com,
linux-snps-...@lists.infradead.org, Mel Gorman <mgor...@suse.de>, Jacob Pan
<jacob.jun....@linux.inte
l.com>, Arnd Bergmann <a...@arndb.de>, ulli.kr...@googlemail.com,
vgu...@kernel.org, linux-clk <linux-...@vger.kernel.org>, Josh Triplett
<j...@joshtriplett.org>, Steven Rostedt <rost...@goodmis.org>,
r...@vger.kernel.org, Borislav Petkov <b...@alien8.de>, bc...@quicinc.com,
Thomas Bogendoerfer <tsbog...@alpha.franken.de>, Parisc List
<linux-par...@vger.kernel.org>, Sudeep Holla <sudeep.ho...@arm.com>, Shawn Guo
<shawn...@kernel.org>, David Miller <da...@davemloft.net>, Rich Felker
<dal...@libc.org>, Tony Lindgren <t...@atomide.com>, amakha...@vmware.com,
Bjorn Andersson <bjorn.anders...@linaro.org>, "H. Peter Anvin"
<h...@zytor.com>, sparcli...@vger.kernel.org, linux-hexa...@vger.kernel.org,
linux-riscv <linux-ri...@lists.infradead.org>, anton.iva...@cambridgegreys.com,
jo...@southpole.se, Yury Norov <yury.no...@gmail.com>, Richard Weinberger
<rich...@nod.at>, the arch/x86 maintainers <x...@kernel.org>, Russell King -
ARM Linux <li...@armlinux.org.uk>, Ingo Molnar <mi...@redhat.com>, Al
bert Ou <a...@eecs.berkeley.edu>, "Paul E. McKenney" <
paul...@kernel.org>, Heiko Carstens <h...@linux.ibm.com>,
stefan.kristians...@saunalahti.fi, openr...@lists.librecores.org, Paul Walmsley
<paul.walms...@sifive.com>, linux-tegra <linux-te...@vger.kernel.org>,
namhy...@kernel.org, Andy Shevchenko <andriy.shevche...@linux.intel.com>,
jpoim...@kernel.org, Juergen Gross <jgr...@suse.com>, Michal Simek
<mon...@monstr.eu>, "open list:BROADCOM NVRAM DRIVER"
<linux-m...@vger.kernel.org>, Palmer Dabbelt <pal...@dabbelt.com>, Anup Patel
<a...@brainfault.org>, i...@jurassic.park.msu.ru, Johannes Berg
<johan...@sipsolutions.net>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Errors-To: linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org
Sender: "Linuxppc-dev"
<linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org>
On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra <pet...@infradead.org> wrote:
>
> Make cpuidle_enter_state() consistent with the s2idle variant and
> verify ->enter() always returns with interrupts disabled.
>
> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
> ---
> 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();
>
>
