Commit a3d2ec9d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.13-2' of... 

Merge tag 'kvmarm-fixes-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 5.13, take #2

- Another state update on exit to userspace fix
- Prevent the creation of mixed 32/64 VMs
parents b35491e6 66e94d5c

arch/arm64/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -463,4 +463,9 @@ static __always_inline void kvm_incr_pc(struct kvm_vcpu *vcpu) 
	vcpu->arch.flags |= KVM_ARM64_INCREMENT_PC;

}



static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature)

{

	return test_bit(feature, vcpu->arch.features);

}



#endif /* __ARM64_KVM_EMULATE_H__ */

arch/arm64/kvm/arm.c

+6 −3
Original line number Diff line number Diff line
@@ -720,11 +720,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
			return ret;

	}



	if (run->immediate_exit)

		return -EINTR;



	vcpu_load(vcpu);



	if (run->immediate_exit) {

		ret = -EINTR;

		goto out;

	}



	kvm_sigset_activate(vcpu);



	ret = 1;
@@ -897,6 +899,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 


	kvm_sigset_deactivate(vcpu);



out:

	/*

	 * In the unlikely event that we are returning to userspace

	 * with pending exceptions or PC adjustment, commit these

arch/arm64/kvm/reset.c

+24 −4
Original line number Diff line number Diff line
@@ -166,6 +166,25 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) 
	return 0;

}



static bool vcpu_allowed_register_width(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu *tmp;

	bool is32bit;

	int i;



	is32bit = vcpu_has_feature(vcpu, KVM_ARM_VCPU_EL1_32BIT);

	if (!cpus_have_const_cap(ARM64_HAS_32BIT_EL1) && is32bit)

		return false;



	/* Check that the vcpus are either all 32bit or all 64bit */

	kvm_for_each_vcpu(i, tmp, vcpu->kvm) {

		if (vcpu_has_feature(tmp, KVM_ARM_VCPU_EL1_32BIT) != is32bit)

			return false;

	}



	return true;

}



/**

 * kvm_reset_vcpu - sets core registers and sys_regs to reset value

 * @vcpu: The VCPU pointer
@@ -217,13 +236,14 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
		}

	}



	switch (vcpu->arch.target) {

	default:

		if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features)) {

			if (!cpus_have_const_cap(ARM64_HAS_32BIT_EL1)) {

	if (!vcpu_allowed_register_width(vcpu)) {

		ret = -EINVAL;

		goto out;

	}



	switch (vcpu->arch.target) {

	default:

		if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features)) {

			pstate = VCPU_RESET_PSTATE_SVC;

		} else {

			pstate = VCPU_RESET_PSTATE_EL1;