KVM: s390: don't use kvm lock in interrupt injection code
authorJens Freimann <jfrei@linux.vnet.ibm.com>
Mon, 11 Aug 2014 13:39:43 +0000 (15:39 +0200)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Mon, 25 Aug 2014 12:35:56 +0000 (14:35 +0200)
The kvm lock protects us against vcpus going away, but they only go
away when the virtual machine is shut down. We don't need this
mutex here, so let's get rid of it.

Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
arch/s390/kvm/interrupt.c

index e2f6240..ba89bbb 100644 (file)
@@ -991,7 +991,6 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
        trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, s390int->type, s390int->parm,
                                   s390int->parm64, 2);
 
-       mutex_lock(&vcpu->kvm->lock);
        li = &vcpu->arch.local_int;
        spin_lock(&li->lock);
        if (inti->type == KVM_S390_PROGRAM_INT)
@@ -1003,7 +1002,6 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
                li->action_bits |= ACTION_STOP_ON_STOP;
        atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);
        spin_unlock(&li->lock);
-       mutex_unlock(&vcpu->kvm->lock);
        kvm_s390_vcpu_wakeup(vcpu);
        return 0;
 }