Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit accb757d authored by Christoffer Dall's avatar Christoffer Dall Committed by Paolo Bonzini
Browse files

KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run 



Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_run().

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> # s390 parts
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
[Rebased. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8a32dd60

arch/mips/kvm/mips.c

+3 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
{

	int r = -EINTR;



	vcpu_load(vcpu);



	kvm_sigset_activate(vcpu);



	if (vcpu->mmio_needed) {
@@ -480,6 +482,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
out:

	kvm_sigset_deactivate(vcpu);



	vcpu_put(vcpu);

	return r;

}

arch/powerpc/kvm/powerpc.c

+5 −1
Original line number Diff line number Diff line
@@ -1408,6 +1408,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
{

	int r;



	vcpu_load(vcpu);



	if (vcpu->mmio_needed) {

		vcpu->mmio_needed = 0;

		if (!vcpu->mmio_is_write)
@@ -1422,7 +1424,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
			r = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run);

			if (r == RESUME_HOST) {

				vcpu->mmio_needed = 1;

				return r;

				goto out;

			}

		}

#endif
@@ -1456,6 +1458,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 


	kvm_sigset_deactivate(vcpu);



out:

	vcpu_put(vcpu);

	return r;

}

arch/s390/kvm/kvm-s390.c

+8 −2
Original line number Diff line number Diff line
@@ -3373,9 +3373,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (kvm_run->immediate_exit)

		return -EINTR;



	vcpu_load(vcpu);



	if (guestdbg_exit_pending(vcpu)) {

		kvm_s390_prepare_debug_exit(vcpu);

		return 0;

		rc = 0;

		goto out;

	}



	kvm_sigset_activate(vcpu);
@@ -3385,7 +3388,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	} else if (is_vcpu_stopped(vcpu)) {

		pr_err_ratelimited("can't run stopped vcpu %d\n",

				   vcpu->vcpu_id);

		return -EINVAL;

		rc = -EINVAL;

		goto out;

	}



	sync_regs(vcpu, kvm_run);
@@ -3415,6 +3419,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	kvm_sigset_deactivate(vcpu);



	vcpu->stat.exit_userspace++;

out:

	vcpu_put(vcpu);

	return rc;

}

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -7280,8 +7280,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
{

	int r;



	vcpu_load(vcpu);

	kvm_sigset_activate(vcpu);



	kvm_load_guest_fpu(vcpu);



	if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
@@ -7328,6 +7328,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	post_kvm_run_save(vcpu);

	kvm_sigset_deactivate(vcpu);



	vcpu_put(vcpu);

	return r;

}

virt/kvm/arm/arm.c

+14 −6
Original line number Diff line number Diff line
@@ -619,21 +619,27 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	if (unlikely(!kvm_vcpu_initialized(vcpu)))

		return -ENOEXEC;



	vcpu_load(vcpu);



	ret = kvm_vcpu_first_run_init(vcpu);

	if (ret)

		return ret;

		goto out;



	if (run->exit_reason == KVM_EXIT_MMIO) {

		ret = kvm_handle_mmio_return(vcpu, vcpu->run);

		if (ret)

			return ret;

		if (kvm_arm_handle_step_debug(vcpu, vcpu->run))

			return 0;

			goto out;

		if (kvm_arm_handle_step_debug(vcpu, vcpu->run)) {

			ret = 0;

			goto out;

		}



	}



	if (run->immediate_exit)

		return -EINTR;

	if (run->immediate_exit) {

		ret = -EINTR;

		goto out;

	}



	kvm_sigset_activate(vcpu);
@@ -772,6 +778,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 


	kvm_sigset_deactivate(vcpu);



out:

	vcpu_put(vcpu);

	return ret;

}