KVM: fix lock imbalance

[linux-block.git] / virt / kvm / ioapic.c

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 1150c6d5c7b893fdaebb73e8eb8b53ed0b41be5d..8a9c6cc382f874030e2407a06f7fe60f6726c088 100644 (file)
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -164,7 +164,9 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
        /* Always delivery PIT interrupt to vcpu 0 */
        if (irq == 0) {
                irqe.dest_mode = 0; /* Physical mode. */
-               irqe.dest_id = ioapic->kvm->vcpus[0]->vcpu_id;
+               /* need to read apic_id from apic regiest since
+                * it can be rewritten */
+               irqe.dest_id = ioapic->kvm->bsp_vcpu->vcpu_id;
        }
 #endif
        return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe);
@@ -220,24 +222,29 @@ void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode)
                        __kvm_ioapic_update_eoi(ioapic, i, trigger_mode);
 }
 
-static int ioapic_in_range(struct kvm_io_device *this, gpa_t addr,
-                          int len, int is_write)
+static inline struct kvm_ioapic *to_ioapic(struct kvm_io_device *dev)
 {
-       struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private;
+       return container_of(dev, struct kvm_ioapic, dev);
+}
 
+static inline int ioapic_in_range(struct kvm_ioapic *ioapic, gpa_t addr)
+{
        return ((addr >= ioapic->base_address &&
                 (addr < ioapic->base_address + IOAPIC_MEM_LENGTH)));
 }
 
-static void ioapic_mmio_read(struct kvm_io_device *this, gpa_t addr, int len,
-                            void *val)
+static int ioapic_mmio_read(struct kvm_io_device *this, gpa_t addr, int len,
+                           void *val)
 {
-       struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private;
+       struct kvm_ioapic *ioapic = to_ioapic(this);
        u32 result;
+       if (!ioapic_in_range(ioapic, addr))
+               return -EOPNOTSUPP;
 
        ioapic_debug("addr %lx\n", (unsigned long)addr);
        ASSERT(!(addr & 0xf));  /* check alignment */
 
+       mutex_lock(&ioapic->kvm->irq_lock);
        addr &= 0xff;
        switch (addr) {
        case IOAPIC_REG_SELECT:
@@ -264,22 +271,28 @@ static void ioapic_mmio_read(struct kvm_io_device *this, gpa_t addr, int len,
        default:
                printk(KERN_WARNING "ioapic: wrong length %d\n", len);
        }
+       mutex_unlock(&ioapic->kvm->irq_lock);
+       return 0;
 }
 
-static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
-                             const void *val)
+static int ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
+                            const void *val)
 {
-       struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private;
+       struct kvm_ioapic *ioapic = to_ioapic(this);
        u32 data;
+       if (!ioapic_in_range(ioapic, addr))
+               return -EOPNOTSUPP;
 
        ioapic_debug("ioapic_mmio_write addr=%p len=%d val=%p\n",
                     (void*)addr, len, val);
        ASSERT(!(addr & 0xf));  /* check alignment */
+
+       mutex_lock(&ioapic->kvm->irq_lock);
        if (len == 4 || len == 8)
                data = *(u32 *) val;
        else {
                printk(KERN_WARNING "ioapic: Unsupported size %d\n", len);
-               return;
+               goto unlock;
        }
 
        addr &= 0xff;
@@ -300,6 +313,9 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
        default:
                break;
        }
+unlock:
+       mutex_unlock(&ioapic->kvm->irq_lock);
+       return 0;
 }
 
 void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
@@ -314,6 +330,11 @@ void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
        ioapic->id = 0;
 }
 
+static const struct kvm_io_device_ops ioapic_mmio_ops = {
+       .read     = ioapic_mmio_read,
+       .write    = ioapic_mmio_write,
+};
+
 int kvm_ioapic_init(struct kvm *kvm)
 {
        struct kvm_ioapic *ioapic;
@@ -323,12 +344,9 @@ int kvm_ioapic_init(struct kvm *kvm)
                return -ENOMEM;
        kvm->arch.vioapic = ioapic;
        kvm_ioapic_reset(ioapic);
-       ioapic->dev.read = ioapic_mmio_read;
-       ioapic->dev.write = ioapic_mmio_write;
-       ioapic->dev.in_range = ioapic_in_range;
-       ioapic->dev.private = ioapic;
+       kvm_iodevice_init(&ioapic->dev, &ioapic_mmio_ops);
        ioapic->kvm = kvm;
-       kvm_io_bus_register_dev(&kvm->mmio_bus, &ioapic->dev);
+       kvm_io_bus_register_dev(kvm, &kvm->mmio_bus, &ioapic->dev);
        return 0;
 }