Skip to content

Commit 7cbdb25

Browse files
ouptonMarc Zyngier
authored andcommitted
KVM: arm64: nv: Expose FEAT_ECBHB to NV-enabled VMs
The exact wording of the restrictions on branch prediction due to FEAT_ECBHB in DDI0487L.b is as follows: When FEAT_ECBHB is implemented, the branch history information created in a context before an exception to a higher Exception level using AArch64 cannot be used by code before that exception to exploitatively control the execution of any indirect branches in code in a different context after the exception. While vEL2 and EL1 are multiplexed at EL1, they exist in different hardware-described contexts as KVM uses different stage-2 MMUs to represent the corresponding translation regimes. Additionally, exception entries into vEL2 always imply a hardware exception entry into literal EL2 for the emulated regime change. Given all of this, and the fact that FEAT_ECBHB places no limitation on the EL of the protected context after the exception, we can claim FEAT_ECBHB on supporting hardware. Signed-off-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 26785cf commit 7cbdb25

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

arch/arm64/kvm/nested.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,8 +1524,7 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val)
15241524
break;
15251525

15261526
case SYS_ID_AA64MMFR1_EL1:
1527-
val &= ~(ID_AA64MMFR1_EL1_ECBHB |
1528-
ID_AA64MMFR1_EL1_CMOW |
1527+
val &= ~(ID_AA64MMFR1_EL1_CMOW |
15291528
ID_AA64MMFR1_EL1_TIDCP1 |
15301529
ID_AA64MMFR1_EL1_nTLBPA |
15311530
ID_AA64MMFR1_EL1_AFP |

0 commit comments

Comments
 (0)