KVM: arm64: Enable SCTLR2 when advertised to the guest

oupton · oupton · commit 7fb7660b9c0b · 2025-07-08T11:36:35.000-07:00
HCRX_EL2.SCTLR2En needs to be set for SCTLR2_EL1 to take effect in hardware (in addition to disabling traps). Reviewed-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20250708172532.1699409-14-oliver.upton@linux.dev Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
@@ -665,6 +665,9 @@ static inline void vcpu_set_hcrx(struct kvm_vcpu *vcpu)
 
 		if (kvm_has_fpmr(kvm))
 			vcpu->arch.hcrx_el2 |= HCRX_EL2_EnFPM;
+
+		if (kvm_has_sctlr2(kvm))
+			vcpu->arch.hcrx_el2 |= HCRX_EL2_SCTLR2En;
 	}
 }
 #endif /* __ARM64_KVM_EMULATE_H__ */

Original file line number	Diff line number	Diff line change
`@@ -665,6 +665,9 @@ static inline void vcpu_set_hcrx(struct kvm_vcpu *vcpu)`
`665`	`665`
`666`	`666`	`if (kvm_has_fpmr(kvm))`
`667`	`667`	`vcpu->arch.hcrx_el2 \|= HCRX_EL2_EnFPM;`
	`668`	`+`
	`669`	`+ if (kvm_has_sctlr2(kvm))`
	`670`	`+ vcpu->arch.hcrx_el2 \|= HCRX_EL2_SCTLR2En;`
`668`	`671`	`}`
`669`	`672`	`}`
`670`	`673`	`#endif /* __ARM64_KVM_EMULATE_H__ */`