]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
KVM: x86: don't take kvm->irq_lock when creating IRQCHIP
authorDavid Hildenbrand <david@redhat.com>
Fri, 7 Apr 2017 08:50:28 +0000 (10:50 +0200)
committerRadim Krčmář <rkrcmar@redhat.com>
Wed, 12 Apr 2017 18:17:14 +0000 (20:17 +0200)
I don't see any reason any more for this lock, seemed to be used to protect
removal of kvm->arch.vpic / kvm->arch.vioapic when already partially
inititalized, now access is properly protected using kvm->arch.irqchip_mode
and this shouldn't be necessary anymore.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
arch/x86/kvm/x86.c

index 0691feeae392852d0883dca2ae7f1c1023053ee3..182fea214c4291816c3b3cab9d898fdf2cce5d3c 100644 (file)
@@ -4028,10 +4028,8 @@ long kvm_arch_vm_ioctl(struct file *filp,
                        /* Pairs with smp_rmb() when reading irqchip_mode */
                        smp_wmb();
                        mutex_lock(&kvm->slots_lock);
-                       mutex_lock(&kvm->irq_lock);
                        kvm_ioapic_destroy(kvm);
                        kvm_pic_destroy(kvm);
-                       mutex_unlock(&kvm->irq_lock);
                        mutex_unlock(&kvm->slots_lock);
                        goto create_irqchip_unlock;
                }