Skip to contentSkip to conversation

irqchip/gic-v4.1: Use readx_poll_timeout_atomic() to fix sleep in atomic

PATCH Applied Zenghui Yu 3 participants 5 messages Jun 5, 2020 – Jun 30, 2020

Subsystems (3)
lore
Share & tools
lore

Zenghui Yu

author reviewer
#0 lore raw

PATCH 1/1 irqchip/gic-v4.1: Use readx_poll_timeout_atomic() to fix sleep in atomic

readx_poll_timeout() can sleep if @sleep_us is specified by the caller, and is therefore unsafe to be used inside the atomic context, which is this case when we use it to poll the GICR_VPENDBASER.Dirty bit in irq_set_vcpu_affinity() callback.

Let's convert to its atomic version instead which helps to get the v4.1 board back to life!

Fixes 96806229ca03 ("irqchip/gic-v4.1: Add support for VPENDBASER's Dirty+Valid signaling")
---
 drivers/irqchip/irq-gic-v3-its.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +4 -4
index cd685f521c77..6a5a87fc4601 100644
@@ -3797,10 +3797,10 @@ static void its_wait_vpt_parse_complete(void)
 	if (!gic_rdists->has_vpend_valid_dirty)
 		return;
 
-	WARN_ON_ONCE(readq_relaxed_poll_timeout(vlpi_base + GICR_VPENDBASER,
-						val,
-						!(val & GICR_VPENDBASER_Dirty),
-						10, 500));
+	WARN_ON_ONCE(readq_relaxed_poll_timeout_atomic(vlpi_base + GICR_VPENDBASER,
+						       val,
+						       !(val & GICR_VPENDBASER_Dirty),
+						       10, 500));
 }
 
 static void its_vpe_schedule(struct its_vpe *vpe)
Signature · 1 line
2.19.1
author reviewer
#1 lore raw

Hi Marc,

Sorry to ping you in the merge window, but ...

Quoted 4 lines · Zenghui Yu

readx_poll_timeout() can sleep if @sleep_us is specified by the caller, and is therefore unsafe to be used inside the atomic context, which is this case when we use it to poll the GICR_VPENDBASER.Dirty bit in irq_set_vcpu_affinity() callback.

this seems like an urgent thing to me. Without this patch, CPUs are easily to get stuck on my board with GICv4.1 enabled. So it'd be good if you can have a look and take this as a fix (if it is correct).

Thanks,
Zenghui

Quoted 30 lines

Let's convert to its atomic version instead which helps to get the v4.1 board back to life!

Fixes 96806229ca03 ("irqchip/gic-v4.1: Add support for VPENDBASER's Dirty+Valid signaling")
---
  drivers/irqchip/irq-gic-v3-its.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +4 -4
index cd685f521c77..6a5a87fc4601 100644
@@ -3797,10 +3797,10 @@ static void its_wait_vpt_parse_complete(void)
  	if (!gic_rdists->has_vpend_valid_dirty)
  		return;
 
-	WARN_ON_ONCE(readq_relaxed_poll_timeout(vlpi_base + GICR_VPENDBASER,
-						val,
-						!(val & GICR_VPENDBASER_Dirty),
-						10, 500));
+	WARN_ON_ONCE(readq_relaxed_poll_timeout_atomic(vlpi_base + GICR_VPENDBASER,
+						       val,
+						       !(val & GICR_VPENDBASER_Dirty),
+						       10, 500));
  }
 
  static void its_vpe_schedule(struct its_vpe *vpe)
maintainer
#2 lore raw

Hi Zenghui,

Quoted 5 lines · Zenghui Yu

Hi Marc,

Sorry to ping you in the merge window, but ...

On 2020/6/5 13:23, Zenghui Yu wrote:

Quoted 8 lines
Quoted 4 lines

readx_poll_timeout() can sleep if @sleep_us is specified by the caller, and is therefore unsafe to be used inside the atomic context, which is this case when we use it to poll the GICR_VPENDBASER.Dirty bit in irq_set_vcpu_affinity() callback.

this seems like an urgent thing to me. Without this patch, CPUs are easily to get stuck on my board with GICv4.1 enabled. So it'd be good if you can have a look and take this as a fix (if it is correct).

No worries. I've earmarked the patch for -rc1 already, just haven't got a chance to build the branch yet (a bit busy on the KVM side).

I'll probably update the branch tonight or tomorrow.

Thanks,

        M.
Signature · 1 line
Jazz is not dead. It just smells funny...
maintainer Applied
#3 lore raw
In reply to Zenghui Yu
Quoted 9 lines · Zenghui Yu

readx_poll_timeout() can sleep if @sleep_us is specified by the caller, and is therefore unsafe to be used inside the atomic context, which is this case when we use it to poll the GICR_VPENDBASER.Dirty bit in irq_set_vcpu_affinity() callback.

Let's convert to its atomic version instead which helps to get the v4.1 board back to life!

[...]

Applied to irq/irqchip-next, thanks!

[1/1] irqchip/gic-v4.1: Use readx_poll_timeout_atomic() to fix sleep in atomic

      commit: a87d4e00eacbc95b44466e3470529f4de49b450a

Cheers,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
merge bot Applied
#4 lore raw
In reply to Zenghui Yu
The following commit has been merged into the irq/urgent branch of tip:

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     31dbb6b1d025506b3b8b8b74e9b697df47b9f696
Gitweb:        https://git.kernel.org/tip/31dbb6b1d025506b3b8b8b74e9b697df47b9f696
Author:        Zenghui Yu <[email protected]>
AuthorDate:    Fri, 05 Jun 2020 13:23:45 +08:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Sun, 21 Jun 2020 15:13:11 +01:00

irqchip/gic-v4.1: Use readx_poll_timeout_atomic() to fix sleep in atomic

readx_poll_timeout() can sleep if @sleep_us is specified by the caller, and is therefore unsafe to be used inside the atomic context, which is this case when we use it to poll the GICR_VPENDBASER.Dirty bit in irq_set_vcpu_affinity() callback.

Let's convert to its atomic version instead which helps to get the v4.1 board back to life!

Fixes 96806229ca03 ("irqchip/gic-v4.1: Add support for VPENDBASER's Dirty+Valid signaling")
---
 drivers/irqchip/irq-gic-v3-its.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +4 -4
index cd685f5..6a5a87f 100644
@@ -3797,10 +3797,10 @@ static void its_wait_vpt_parse_complete(void)
 	if (!gic_rdists->has_vpend_valid_dirty)
 		return;
 
-	WARN_ON_ONCE(readq_relaxed_poll_timeout(vlpi_base + GICR_VPENDBASER,
-						val,
-						!(val & GICR_VPENDBASER_Dirty),
-						10, 500));
+	WARN_ON_ONCE(readq_relaxed_poll_timeout_atomic(vlpi_base + GICR_VPENDBASER,
+						       val,
+						       !(val & GICR_VPENDBASER_Dirty),
+						       10, 500));
 }
 
 static void its_vpe_schedule(struct its_vpe *vpe)