@@ -363,9 +363,8 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
{
int ret;
- ret = vcpu_load(vcpu);
- if (ret)
- return ret;
+ if (mutex_lock_killable(&vcpu->mutex))
+ return -EINTR;
trace_kvm_set_guest_debug(vcpu, dbg->control);
@@ -387,8 +386,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
vcpu->guest_debug = 0;
}
+ ret = 0;
out:
- vcpu_put(vcpu);
+ mutex_unlock(&vcpu->mutex);
return ret;
}
@@ -381,29 +381,25 @@ static void vcpu_power_off(struct kvm_vcpu *vcpu)
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
- int ret;
-
- ret = vcpu_load(vcpu);
- if (ret)
- return ret;
+ if (mutex_lock_killable(&vcpu->mutex))
+ return -EINTR;
if (vcpu->arch.power_off)
mp_state->mp_state = KVM_MP_STATE_STOPPED;
else
mp_state->mp_state = KVM_MP_STATE_RUNNABLE;
- vcpu_put(vcpu);
+ mutex_unlock(&vcpu->mutex);
return 0;
}
int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
- int ret;
+ int ret = 0;
- ret = vcpu_load(vcpu);
- if (ret)
- return ret;
+ if (mutex_lock_killable(&vcpu->mutex))
+ return -EINTR;
switch (mp_state->mp_state) {
case KVM_MP_STATE_RUNNABLE:
@@ -416,7 +412,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
ret = -EINVAL;
}
- vcpu_put(vcpu);
+ mutex_unlock(&vcpu->mutex);
return ret;
}
@@ -1009,9 +1005,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_device_attr attr;
long r;
- r = vcpu_load(vcpu);
- if (r)
- return r;
+ if (mutex_lock_killable(&vcpu->mutex))
+ return -EINTR;
switch (ioctl) {
case KVM_ARM_VCPU_INIT: {
@@ -1089,7 +1084,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
r = -EINVAL;
}
- vcpu_put(vcpu);
+ mutex_unlock(&vcpu->mutex);
return r;
}
Calling vcpu_load() takes the vcpu->mutex, registers preempt notifiers for this vcpu, and calls kvm_arch_vcpu_load(). The latter will soon be doing a lot of heavy lifting on arm/arm64 and will try to do things such as enabling the virtual timer and setting us up to handle interrupts from the timer hardware. Loading state onto hardware registers and enabling hardware to signal interrupts can be problematic when we're not actually about to run the VCPU, because it makes it difficult to establish the right context when handling interrupts from the timer, and it makes the register access code difficult to reason about. Luckily, now when we call vcpu_load in each ioctl implementation, we can simply change the non-KVM_RUN vcpu ioctls to only take the vcpu->mutex instead of calling vcpu_load(), and our kvm_arch_vcpu_load() is only used for loading vcpu content to the physical CPU when we're actually going to run the vcpu. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/guest.c | 8 ++++---- virt/kvm/arm/arm.c | 25 ++++++++++--------------- 2 files changed, 14 insertions(+), 19 deletions(-)