2020-08-21 08:58:13

by Peter Zijlstra

Subject: [PATCH v2 02/11] cpuidle: Fixup IRQ state

Match the pattern elsewhere in this file.

Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Steven Rostedt (VMware) <[email protected]>
Tested-by: Marco Elver <[email protected]>
---
drivers/cpuidle/cpuidle.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -153,7 +153,8 @@ static void enter_s2idle_proper(struct c
*/
stop_critical_timings();
drv->states[index].enter_s2idle(dev, drv, index);
- WARN_ON(!irqs_disabled());
+ if (WARN_ON_ONCE(!irqs_disabled()))
+ local_irq_disable();
/*
* timekeeping_resume() that will be called by tick_unfreeze() for the
* first CPU executing it calls functions containing RCU read-side

2020-08-21 17:38:16

by Rafael J. Wysocki

Subject: Re: [PATCH v2 02/11] cpuidle: Fixup IRQ state

On Friday, August 21, 2020 10:47:40 AM CEST Peter Zijlstra wrote:
> Match the pattern elsewhere in this file.
>
> Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
> Reviewed-by: Steven Rostedt (VMware) <[email protected]>
> Tested-by: Marco Elver <[email protected]>

For all patches in the series:

Acked-by: Rafael J. Wysocki <[email protected]>

> ---
> drivers/cpuidle/cpuidle.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- a/drivers/cpuidle/cpuidle.c
> +++ b/drivers/cpuidle/cpuidle.c
> @@ -153,7 +153,8 @@ static void enter_s2idle_proper(struct c
> */
> stop_critical_timings();
> drv->states[index].enter_s2idle(dev, drv, index);
> - WARN_ON(!irqs_disabled());
> + if (WARN_ON_ONCE(!irqs_disabled()))
> + local_irq_disable();
> /*
> * timekeeping_resume() that will be called by tick_unfreeze() for the
> * first CPU executing it calls functions containing RCU read-side
>
>
>

2020-08-27 01:08:01

by Joel Fernandes

Subject: Re: [PATCH v2 02/11] cpuidle: Fixup IRQ state

On Fri, Aug 21, 2020 at 07:36:43PM +0200, Rafael J. Wysocki wrote:
> On Friday, August 21, 2020 10:47:40 AM CEST Peter Zijlstra wrote:
> > Match the pattern elsewhere in this file.
> >
> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
> > Reviewed-by: Steven Rostedt (VMware) <[email protected]>
> > Tested-by: Marco Elver <[email protected]>
>
> For all patches in the series:
>
> Acked-by: Rafael J. Wysocki <[email protected]>

Reviewed-by: Joel Fernandes (Google) <[email protected]>

thanks,

- Joel

>
> > ---
> > drivers/cpuidle/cpuidle.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > --- a/drivers/cpuidle/cpuidle.c
> > +++ b/drivers/cpuidle/cpuidle.c
> > @@ -153,7 +153,8 @@ static void enter_s2idle_proper(struct c
> > */
> > stop_critical_timings();
> > drv->states[index].enter_s2idle(dev, drv, index);
> > - WARN_ON(!irqs_disabled());
> > + if (WARN_ON_ONCE(!irqs_disabled()))
> > + local_irq_disable();
> > /*
> > * timekeeping_resume() that will be called by tick_unfreeze() for the
> > * first CPU executing it calls functions containing RCU read-side
> >
> >
> >
>
>
>
>

2020-08-27 07:59:26

by tip-bot2 for Alexey Makhalov

Subject: [tip: locking/core] cpuidle: Fixup IRQ state

The following commit has been merged into the locking/core branch of tip:

Commit-ID: 49d9c5936314e44d314c605c39cce0fd947f9c3a
Gitweb: https://git.kernel.org/tip/49d9c5936314e44d314c605c39cce0fd947f9c3a
Author: Peter Zijlstra <[email protected]>
AuthorDate: Thu, 20 Aug 2020 16:47:24 +02:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Wed, 26 Aug 2020 12:41:53 +02:00

cpuidle: Fixup IRQ state

Match the pattern elsewhere in this file.

Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Steven Rostedt (VMware) <[email protected]>
Reviewed-by: Thomas Gleixner <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
Tested-by: Marco Elver <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
drivers/cpuidle/cpuidle.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 8719731..2fe4f3c 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -153,7 +153,8 @@ static void enter_s2idle_proper(struct cpuidle_driver *drv,
*/
stop_critical_timings();
drv->states[index].enter_s2idle(dev, drv, index);
- WARN_ON(!irqs_disabled());
+ if (WARN_ON_ONCE(!irqs_disabled()))
+ local_irq_disable();
/*
* timekeeping_resume() that will be called by tick_unfreeze() for the
* first CPU executing it calls functions containing RCU read-side