On 21/06/2019 10:37, Marc Zyngier wrote:
From: Christoffer Dall <christoffer.d...@arm.com> Reset the VCPU with PSTATE.M = EL2h when the nested virtualization feature is enabled on the VCPU. Signed-off-by: Christoffer Dall <christoffer.d...@arm.com> Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> --- arch/arm64/kvm/reset.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 1140b4485575..675ca07dbb05 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -52,6 +52,11 @@ static const struct kvm_regs default_regs_reset = { PSR_F_BIT | PSR_D_BIT), };+static const struct kvm_regs default_regs_reset_el2 = {+ .regs.pstate = (PSR_MODE_EL2h | PSR_A_BIT | PSR_I_BIT | + PSR_F_BIT | PSR_D_BIT), +}; + static const struct kvm_regs default_regs_reset32 = { .regs.pstate = (PSR_AA32_MODE_SVC | PSR_AA32_A_BIT | PSR_AA32_I_BIT | PSR_AA32_F_BIT), @@ -302,6 +307,8 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) if (!cpu_has_32bit_el1()) goto out; cpu_reset = &default_regs_reset32; + } else if (test_bit(KVM_ARM_VCPU_NESTED_VIRT, vcpu->arch.features)) {
minor nit: "else if nested_virt_in_use(vcpu)" ? Either ways: Reviewed-by: Suzuki K Poulose <suzuki.poul...@arm.com> _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
