diff mbox

[-,RE-RESEND] IRQ: don't suspend nested_thread irqs over system suspend.

Message ID 20150517151934.2393e8f8@notabene.brown (mailing list archive)
State Accepted, archived
Headers show

Commit Message

NeilBrown May 17, 2015, 5:19 a.m. UTC
Nested IRQs can only fire when the parent irq fires.
So when the parent is suspended, there is no need to suspend
the child irq.

Suspending nested irqs can cause a problem is they are suspended or
resumed in the wrong order.
If an interrupt fires while the parent is active but the child is
suspended, then the interrupt will not be acknowledged properly
and so an interrupt storm can result.
This is particularly likely if the parent is resumed before
the child, and the interrupt was raised during suspend.

Ensuring correct ordering would be possible, but it is simpler
to just never suspend nested interrupts.

Signed-off-by: NeilBrown <neil@brown.name>

---
At Rafael's request I'm resending this.  No response last time (except from Rafael),
no change in the code.

This change will fix a bug so that the work-around introduced by 
  8b41669ceba0 ("mfd: twl4030: Fix chained irq handling on resume from suspend")
can be reverted.  This work-around misuses the IRQF_EARLY_RESUME flag, and triggers
a warning on resume:

[   56.095825] WARNING: CPU: 0 PID: 3 at ../kernel/irq/manage.c:661 irq_nested_primary_handler+0x18/0x28()

(though the line number might have changed).

NeilBrown

Comments

Peter Zijlstra May 18, 2015, 12:16 p.m. UTC | #1
On Sun, May 17, 2015 at 03:19:34PM +1000, NeilBrown wrote:
> 
> 
> Nested IRQs can only fire when the parent irq fires.
> So when the parent is suspended, there is no need to suspend
> the child irq.
> 
> Suspending nested irqs can cause a problem is they are suspended or
> resumed in the wrong order.
> If an interrupt fires while the parent is active but the child is
> suspended, then the interrupt will not be acknowledged properly
> and so an interrupt storm can result.
> This is particularly likely if the parent is resumed before
> the child, and the interrupt was raised during suspend.
> 
> Ensuring correct ordering would be possible, but it is simpler
> to just never suspend nested interrupts.

Looks sane to me, but it's Thomas' call.

FWIW:

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>

> 
> Signed-off-by: NeilBrown <neil@brown.name>
> ---
> diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
> index 5204a6d1b985..d22786a6dbde 100644
> --- a/kernel/irq/pm.c
> +++ b/kernel/irq/pm.c
> @@ -123,6 +123,8 @@ void suspend_device_irqs(void)
>  		unsigned long flags;
>  		bool sync;
>  
> +		if (irq_settings_is_nested_thread(desc))
> +			continue;
>  		raw_spin_lock_irqsave(&desc->lock, flags);
>  		sync = suspend_device_irq(desc, irq);
>  		raw_spin_unlock_irqrestore(&desc->lock, flags);
> @@ -163,6 +165,8 @@ static void resume_irqs(bool want_early)
>  
>  		if (!is_early && want_early)
>  			continue;
> +		if (irq_settings_is_nested_thread(desc))
> +			continue;
>  
>  		raw_spin_lock_irqsave(&desc->lock, flags);
>  		resume_irq(desc, irq);


--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 5204a6d1b985..d22786a6dbde 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -123,6 +123,8 @@  void suspend_device_irqs(void)
 		unsigned long flags;
 		bool sync;
 
+		if (irq_settings_is_nested_thread(desc))
+			continue;
 		raw_spin_lock_irqsave(&desc->lock, flags);
 		sync = suspend_device_irq(desc, irq);
 		raw_spin_unlock_irqrestore(&desc->lock, flags);
@@ -163,6 +165,8 @@  static void resume_irqs(bool want_early)
 
 		if (!is_early && want_early)
 			continue;
+		if (irq_settings_is_nested_thread(desc))
+			continue;
 
 		raw_spin_lock_irqsave(&desc->lock, flags);
 		resume_irq(desc, irq);