Skip to contentSkip to conversation

arm64: Fix incorrect irqflag restore for priority masking for compat

PATCH New James Morse 1 participant 1 message Oct 3, 2019 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: Fix incorrect irqflag restore for priority masking for compat

Commit bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority masking") added a macro to the entry.S call paths that leave the PSTATE.I bit set. This tells the pPNMI masking logic that interrupts are masked by the CPU, not by the PMR. This value is read back by local_daif_save().

Commit bd82d4bd2188 added this call to el0_svc, as el0_svc_handler is called with interrupts masked. el0_svc_compat was missed, but should be covered in the same way as both of these paths end up in el0_svc_common(), which expects to unmask interrupts.

Fixes bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority masking")
Cc Julien Thierry <[email protected]>
---
 arch/arm64/kernel/entry.S | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/kernel/entry.S +1 -0
index 84a822748c84..e304fe04b098 100644
@@ -775,6 +775,7 @@ el0_sync_compat:
 	b.ge	el0_dbg
 	b	el0_inv
 el0_svc_compat:
+	gic_prio_kentry_setup tmp=x1
 	mov	x0, sp
 	bl	el0_svc_compat_handler
 	b	ret_to_user
Signature · 7 lines
2.20.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel