Commit b856a591 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

arm/arm64: KVM: Reset the HCR on each vcpu when resetting the vcpu 



When userspace resets the vcpu using KVM_ARM_VCPU_INIT, we should also
reset the HCR, because we now modify the HCR dynamically to
enable/disable trapping of guest accesses to the VM registers.

This is crucial for reboot of VMs working since otherwise we will not be
doing the necessary cache maintenance operations when faulting in pages
with the guest MMU off.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 3ad8b3de

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu); 
void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr);

void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);



static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr = HCR_GUEST_MASK;

}



static inline bool vcpu_mode_is_32bit(struct kvm_vcpu *vcpu)

{

	return 1;

arch/arm/kvm/arm.c

+2 −0
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, 
	if (ret)

		return ret;



	vcpu_reset_hcr(vcpu);



	/*

	 * Handle the "start in power-off" case by marking the VCPU as paused.

	 */

arch/arm/kvm/guest.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr = HCR_GUEST_MASK;

	return 0;

}

arch/arm64/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu); 
void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr);

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;

}



static inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu)

{

	return (unsigned long *)&vcpu_gp_regs(vcpu)->regs.pc;

arch/arm64/kvm/guest.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE