Commit 801f6772 authored Jan 11, 2015 by Marc Zyngier Committed by Paolo Bonzini Jan 12, 2015

arm64: KVM: Fix HCR setting for 32bit guests



Commit b856a591 (arm/arm64: KVM: Reset the HCR on each vcpu
when resetting the vcpu) moved the init of the HCR register to
happen later in the init of a vcpu, but left out the fixup
done in kvm_reset_vcpu when preparing for a 32bit guest.

As a result, the 32bit guest is run as a 64bit guest, but the
rest of the kernel still manages it as a 32bit. Fun follows.

Moving the fixup to vcpu_reset_hcr solves the problem for good.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 55e858b7

arch/arm64/include/asm/kvm_emulate.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);
		static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
		{
		vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
		if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))
		vcpu->arch.hcr_el2 &= ~HCR_RW;
		}

		static inline unsigned long vcpu_pc(const struct kvm_vcpu vcpu)

arch/arm64/kvm/reset.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
		if (!cpu_has_32bit_el1())
		return -EINVAL;
		cpu_reset = &default_regs_reset32;
		vcpu->arch.hcr_el2 &= ~HCR_RW;
		} else {
		cpu_reset = &default_regs_reset;
		}