Merge branch 'preempt' into release

[~andy/linux] / arch / x86 / kvm / i8259.c

diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index 1ccb50c74f186d779e8f67b9b833e896b812b3d9..01f151682802e3e8349c8a38f84c23cdce67a4cf 100644 (file)
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -30,50 +30,24 @@
 #include "irq.h"
 
 #include <linux/kvm_host.h>
-
-static void pic_lock(struct kvm_pic *s)
-       __acquires(&s->lock)
-{
-       spin_lock(&s->lock);
-}
-
-static void pic_unlock(struct kvm_pic *s)
-       __releases(&s->lock)
-{
-       struct kvm *kvm = s->kvm;
-       unsigned acks = s->pending_acks;
-       bool wakeup = s->wakeup_needed;
-       struct kvm_vcpu *vcpu;
-
-       s->pending_acks = 0;
-       s->wakeup_needed = false;
-
-       spin_unlock(&s->lock);
-
-       while (acks) {
-               kvm_notify_acked_irq(kvm, SELECT_PIC(__ffs(acks)),
-                                    __ffs(acks));
-               acks &= acks - 1;
-       }
-
-       if (wakeup) {
-               vcpu = s->kvm->vcpus[0];
-               if (vcpu)
-                       kvm_vcpu_kick(vcpu);
-       }
-}
+#include "trace.h"
 
 static void pic_clear_isr(struct kvm_kpic_state *s, int irq)
 {
        s->isr &= ~(1 << irq);
        s->isr_ack |= (1 << irq);
+       if (s != &s->pics_state->pics[0])
+               irq += 8;
+       kvm_notify_acked_irq(s->pics_state->kvm, SELECT_PIC(irq), irq);
 }
 
 void kvm_pic_clear_isr_ack(struct kvm *kvm)
 {
        struct kvm_pic *s = pic_irqchip(kvm);
+       spin_lock(&s->lock);
        s->pics[0].isr_ack = 0xff;
        s->pics[1].isr_ack = 0xff;
+       spin_unlock(&s->lock);
 }
 
 /*
@@ -174,9 +148,9 @@ static void pic_update_irq(struct kvm_pic *s)
 
 void kvm_pic_update_irq(struct kvm_pic *s)
 {
-       pic_lock(s);
+       spin_lock(&s->lock);
        pic_update_irq(s);
-       pic_unlock(s);
+       spin_unlock(&s->lock);
 }
 
 int kvm_pic_set_irq(void *opaque, int irq, int level)
@@ -184,12 +158,14 @@ int kvm_pic_set_irq(void *opaque, int irq, int level)
        struct kvm_pic *s = opaque;
        int ret = -1;
 
-       pic_lock(s);
+       spin_lock(&s->lock);
        if (irq >= 0 && irq < PIC_NUM_PINS) {
                ret = pic_set_irq1(&s->pics[irq >> 3], irq & 7, level);
                pic_update_irq(s);
+               trace_kvm_pic_set_irq(irq >> 3, irq & 7, s->pics[irq >> 3].elcr,
+                                     s->pics[irq >> 3].imr, ret == 0);
        }
-       pic_unlock(s);
+       spin_unlock(&s->lock);
 
        return ret;
 }
@@ -217,7 +193,7 @@ int kvm_pic_read_irq(struct kvm *kvm)
        int irq, irq2, intno;
        struct kvm_pic *s = pic_irqchip(kvm);
 
-       pic_lock(s);
+       spin_lock(&s->lock);
        irq = pic_get_irq(&s->pics[0]);
        if (irq >= 0) {
                pic_intack(&s->pics[0], irq);
@@ -242,8 +218,7 @@ int kvm_pic_read_irq(struct kvm *kvm)
                intno = s->pics[0].irq_base + irq;
        }
        pic_update_irq(s);
-       pic_unlock(s);
-       kvm_notify_acked_irq(kvm, SELECT_PIC(irq), irq);
+       spin_unlock(&s->lock);
 
        return intno;
 }
@@ -252,7 +227,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s)
 {
        int irq, irqbase, n;
        struct kvm *kvm = s->pics_state->irq_request_opaque;
-       struct kvm_vcpu *vcpu0 = kvm->vcpus[0];
+       struct kvm_vcpu *vcpu0 = kvm->bsp_vcpu;
 
        if (s == &s->pics_state->pics[0])
                irqbase = 0;
@@ -263,7 +238,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s)
                if (vcpu0 && kvm_apic_accept_pic_intr(vcpu0))
                        if (s->irr & (1 << irq) || s->isr & (1 << irq)) {
                                n = irq + irqbase;
-                               s->pics_state->pending_acks |= 1 << n;
+                               kvm_notify_acked_irq(kvm, SELECT_PIC(n), n);
                        }
        }
        s->last_irr = 0;
@@ -428,8 +403,7 @@ static u32 elcr_ioport_read(void *opaque, u32 addr1)
        return s->elcr;
 }
 
-static int picdev_in_range(struct kvm_io_device *this, gpa_t addr,
-                          int len, int is_write)
+static int picdev_in_range(gpa_t addr)
 {
        switch (addr) {
        case 0x20:
@@ -444,18 +418,25 @@ static int picdev_in_range(struct kvm_io_device *this, gpa_t addr,
        }
 }
 
-static void picdev_write(struct kvm_io_device *this,
+static inline struct kvm_pic *to_pic(struct kvm_io_device *dev)
+{
+       return container_of(dev, struct kvm_pic, dev);
+}
+
+static int picdev_write(struct kvm_io_device *this,
                         gpa_t addr, int len, const void *val)
 {
-       struct kvm_pic *s = this->private;
+       struct kvm_pic *s = to_pic(this);
        unsigned char data = *(unsigned char *)val;
+       if (!picdev_in_range(addr))
+               return -EOPNOTSUPP;
 
        if (len != 1) {
                if (printk_ratelimit())
                        printk(KERN_ERR "PIC: non byte write\n");
-               return;
+               return 0;
        }
-       pic_lock(s);
+       spin_lock(&s->lock);
        switch (addr) {
        case 0x20:
        case 0x21:
@@ -468,21 +449,24 @@ static void picdev_write(struct kvm_io_device *this,
                elcr_ioport_write(&s->pics[addr & 1], addr, data);
                break;
        }
-       pic_unlock(s);
+       spin_unlock(&s->lock);
+       return 0;
 }
 
-static void picdev_read(struct kvm_io_device *this,
-                       gpa_t addr, int len, void *val)
+static int picdev_read(struct kvm_io_device *this,
+                      gpa_t addr, int len, void *val)
 {
-       struct kvm_pic *s = this->private;
+       struct kvm_pic *s = to_pic(this);
        unsigned char data = 0;
+       if (!picdev_in_range(addr))
+               return -EOPNOTSUPP;
 
        if (len != 1) {
                if (printk_ratelimit())
                        printk(KERN_ERR "PIC: non byte read\n");
-               return;
+               return 0;
        }
-       pic_lock(s);
+       spin_lock(&s->lock);
        switch (addr) {
        case 0x20:
        case 0x21:
@@ -496,7 +480,8 @@ static void picdev_read(struct kvm_io_device *this,
                break;
        }
        *(unsigned char *)val = data;
-       pic_unlock(s);
+       spin_unlock(&s->lock);
+       return 0;
 }
 
 /*
@@ -505,20 +490,27 @@ static void picdev_read(struct kvm_io_device *this,
 static void pic_irq_request(void *opaque, int level)
 {
        struct kvm *kvm = opaque;
-       struct kvm_vcpu *vcpu = kvm->vcpus[0];
+       struct kvm_vcpu *vcpu = kvm->bsp_vcpu;
        struct kvm_pic *s = pic_irqchip(kvm);
        int irq = pic_get_irq(&s->pics[0]);
 
        s->output = level;
        if (vcpu && level && (s->pics[0].isr_ack & (1 << irq))) {
                s->pics[0].isr_ack &= ~(1 << irq);
-               s->wakeup_needed = true;
+               kvm_vcpu_kick(vcpu);
        }
 }
 
+static const struct kvm_io_device_ops picdev_ops = {
+       .read     = picdev_read,
+       .write    = picdev_write,
+};
+
 struct kvm_pic *kvm_create_pic(struct kvm *kvm)
 {
        struct kvm_pic *s;
+       int ret;
+
        s = kzalloc(sizeof(struct kvm_pic), GFP_KERNEL);
        if (!s)
                return NULL;
@@ -534,10 +526,12 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm)
        /*
         * Initialize PIO device
         */
-       s->dev.read = picdev_read;
-       s->dev.write = picdev_write;
-       s->dev.in_range = picdev_in_range;
-       s->dev.private = s;
-       kvm_io_bus_register_dev(&kvm->pio_bus, &s->dev);
+       kvm_iodevice_init(&s->dev, &picdev_ops);
+       ret = kvm_io_bus_register_dev(kvm, &kvm->pio_bus, &s->dev);
+       if (ret < 0) {
+               kfree(s);
+               return NULL;
+       }
+
        return s;
 }