KVM: arm64: add workaround for Cortex-A57 erratum #852523
Subsystems (4)
PATCH 1/1 KVM: arm64: add workaround for Cortex-A57 erratum #852523
When restoring the system register state for an AArch32 guest at EL2, writes to DACR32_EL2 may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.
This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
--- arch/arm64/kvm/hyp.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/kvm/hyp.S +3 -1
@@ -739,6 +739,9 @@ ENTRY(__kvm_vcpu_run) // Guest context add x2, x0, #VCPU_CONTEXT + // We must restore the 32-bit state before the sysregs, thanks + // to Cortex-A57 erratum #852523. + restore_guest_32bit_state bl __restore_sysregs skip_debug_state x3, 1f
@@ -746,7 +749,6 @@ ENTRY(__kvm_vcpu_run) kern_hyp_va x3 bl __restore_debug 1: - restore_guest_32bit_state restore_guest_regs // That's it, no more messing around.
Signature · 1 line
2.1.4
Quoted 4 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.
Thanks for the CC, dropping down to just the Xen folks/list and you guys.
The errata doc I've got doesn't yet cover this, so I've a few questions.
Quoted 4 lines
This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Is it required that the AArch32 aliases are all restored strictly before the AArch64 sysregs, or just that at least one sysreg is restored after DACR32_EL2 (or a specific one?)?
The Xen ctxt switch code[0] has DACR_EL2 in the midst of it all, and certainly followed by some sysregs, which I've got my fingers crossed happens to be sufficient (other than maybe adding a comment).
Cheers,
Ian.
Quoted 30 lines
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/arm64/kvm/hyp.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/arm64/kvm/hyp.S +3
-1@@ -739,6 +739,9 @@ ENTRY(__kvm_vcpu_run) // Guest context add x2, x0, #VCPU_CONTEXT + // We must restore the 32-bit state before the sysregs, thanks + // to Cortex-A57 erratum #852523. + restore_guest_32bit_state bl __restore_sysregs skip_debug_state x3, 1f@@ -746,7 +749,6 @@ ENTRY(__kvm_vcpu_run) kern_hyp_va x3 bl __restore_debug 1: - restore_guest_32bit_state restore_guest_regs // That's it, no more messing around.
Hi Ian,
Quoted 9 lines · Ian Campbell
Quoted 4 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.Thanks for the CC, dropping down to just the Xen folks/list and you guys.
The errata doc I've got doesn't yet cover this, so I've a few questions.
It should be updated in the next few days, but I wanted to get this out ASAP since it's quite easy to hit under KVM (particularly with the new domain-based PAN implementation for arch/arm/).
Quoted 8 lines
Quoted 4 lines
This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Is it required that the AArch32 aliases are all restored strictly before the AArch64 sysregs, or just that at least one sysreg is restored after
DACR32_EL2(or a specific one?)?
Take your pick from: SCTLR_EL1, TCR_EL1, TTBR0_EL1, TTBR1_EL1, or CONTEXTIDR_EL1. Writing any of those after DACR32_EL2 will avoid the erratum.
Quoted 3 lines
The Xen ctxt switch code[0] has
DACR_EL2in the midst of it all, and certainly followed by some sysregs, which I've got my fingers crossed happens to be sufficient (other than maybe adding a comment).
It looks like you restore CONTEXTIDR_EL1 fairly late, so you should be ok.
Will
Quoted 6 lines · Will Deacon
Quoted 3 lines
The Xen ctxt switch code[0] has
DACR_EL2in the midst of it all, and certainly followed by some sysregs, which I've got my fingers crossed happens to be sufficient (other than maybe adding a comment).It looks like you restore
CONTEXTIDR_EL1fairly late, so you should be ok.
It may be worth to have a comment in the code explaining the errata to avoid introduce by inadvertence if we plan to re-order the context switch.
I can send a patch for that.
Regards,
Signature · 1 line
Julien Grall
Quoted 7 lines · Julien Grall
Quoted 6 lines · Will Deacon
Quoted 3 lines
The Xen ctxt switch code[0] has
DACR_EL2in the midst of it all, and certainly followed by some sysregs, which I've got my fingers crossed happens to be sufficient (other than maybe adding a comment).It looks like you restore
CONTEXTIDR_EL1fairly late, so you should be ok.
Thanks Will.
Quoted 5 lines
It may be worth to have a comment in the code explaining the errata to avoid introduce by inadvertence if we plan to re-order the context switch.
I can send a patch for that.
Yes, please, a comment right before we restore DACR32_EL2 with the list of register Will gave would be best I think.
Quoted 3 lines
Regards,
Quoted 5 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.
Quoted 8 lines
This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>
I'll queue that together with the next batch of fixes.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Quoted 11 lines · Marc Zyngier
Quoted 10 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Quoted 7 lines
Quoted 3 lines
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>Reviewed-by Marc Zyngier <[email protected]>I'll queue that together with the next batch of fixes.
Great, thanks Marc.
Will
Quoted 11 lines · Marc Zyngier
Quoted 10 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Quoted 7 lines
Quoted 3 lines
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>Reviewed-by Marc Zyngier <[email protected]>I'll queue that together with the next batch of fixes.
Great, thanks Marc.
Will
Quoted 11 lines · Marc Zyngier
Quoted 10 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Quoted 6 lines
Quoted 3 lines
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>Reviewed-by Marc Zyngier <[email protected]>
Looks good to me too, and I just gave this a spin with my loop test on Juno as well.
Thanks,
-Christoffer
Quoted 11 lines · Marc Zyngier
Quoted 10 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Quoted 6 lines
Quoted 3 lines
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>Reviewed-by Marc Zyngier <[email protected]>
Looks good to me too, and I just gave this a spin with my loop test on Juno as well.
Thanks,
-Christoffer
Quoted 5 lines · Will Deacon
When restoring the system register state for an AArch32 guest at EL2, writes to
DACR32_EL2may not be correctly synchronised by Cortex-A57, which can lead to the guest effectively running with junk in the DACR and running into unexpected domain faults.
Quoted 8 lines
This patch works around the issue by re-ordering our restoration of the AArch32 register aliases so that they happen before the AArch64 system registers. Ensuring that the registers are restored in this order guarantees that they will be correctly synchronised by the core.
Cc <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>
I'll queue that together with the next batch of fixes.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...