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

Commit e83dff5e 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_set_mpstate 



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

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fd232561

arch/s390/kvm/kvm-s390.c

+3 −0
Original line number Diff line number Diff line
@@ -2850,6 +2850,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
{

	int rc = 0;



	vcpu_load(vcpu);



	/* user space knows about this interface - let it control the state */

	vcpu->kvm->arch.user_cpu_state_ctrl = 1;
@@ -2867,6 +2869,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
		rc = -ENXIO;

	}



	vcpu_put(vcpu);

	return rc;

}

arch/x86/kvm/x86.c

+11 −3
Original line number Diff line number Diff line
@@ -7481,15 +7481,19 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	int ret = -EINVAL;



	vcpu_load(vcpu);



	if (!lapic_in_kernel(vcpu) &&

	    mp_state->mp_state != KVM_MP_STATE_RUNNABLE)

		return -EINVAL;

		goto out;



	/* INITs are latched while in SMM */

	if ((is_smm(vcpu) || vcpu->arch.smi_pending) &&

	    (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||

	     mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))

		return -EINVAL;

		goto out;



	if (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {

		vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;
@@ -7497,7 +7501,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
	} else

		vcpu->arch.mp_state = mp_state->mp_state;

	kvm_make_request(KVM_REQ_EVENT, vcpu);

	return 0;



	ret = 0;

out:

	vcpu_put(vcpu);

	return ret;

}



int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index,

virt/kvm/arm/arm.c

+7 −2
Original line number Diff line number Diff line
@@ -395,6 +395,10 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	int ret = 0;



	vcpu_load(vcpu);



	switch (mp_state->mp_state) {

	case KVM_MP_STATE_RUNNABLE:

		vcpu->arch.power_off = false;
@@ -403,10 +407,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
		vcpu_power_off(vcpu);

		break;

	default:

		return -EINVAL;

		ret = -EINVAL;

	}



	return 0;

	vcpu_put(vcpu);

	return ret;

}



/**

virt/kvm/kvm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2649,9 +2649,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		r = -EFAULT;

		if (copy_from_user(&mp_state, argp, sizeof(mp_state)))

			goto out;

		vcpu_load(vcpu);

		r = kvm_arch_vcpu_ioctl_set_mpstate(vcpu, &mp_state);

		vcpu_put(vcpu);

		break;

	}

	case KVM_TRANSLATE: {