ALSA: ice1724 - Fix ESI Maya44 capture source control

[safe/jmp/linux-2.6] / virt / kvm / coalesced_mmio.c

diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index b40946c..36e2580 100644 (file)
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -10,6 +10,7 @@
 #include "iodev.h"
 
 #include <linux/kvm_host.h>
+#include <linux/slab.h>
 #include <linux/kvm.h>
 
 #include "coalesced_mmio.h"
@@ -19,18 +20,14 @@ static inline struct kvm_coalesced_mmio_dev *to_mmio(struct kvm_io_device *dev)
        return container_of(dev, struct kvm_coalesced_mmio_dev, dev);
 }
 
-static int coalesced_mmio_in_range(struct kvm_io_device *this,
-                                  gpa_t addr, int len, int is_write)
+static int coalesced_mmio_in_range(struct kvm_coalesced_mmio_dev *dev,
+                                  gpa_t addr, int len)
 {
-       struct kvm_coalesced_mmio_dev *dev = to_mmio(this);
        struct kvm_coalesced_mmio_zone *zone;
        struct kvm_coalesced_mmio_ring *ring;
        unsigned avail;
        int i;
 
-       if (!is_write)
-               return 0;
-
        /* Are we able to batch it ? */
 
        /* last is the first free entry
@@ -60,11 +57,13 @@ static int coalesced_mmio_in_range(struct kvm_io_device *this,
        return 0;
 }
 
-static void coalesced_mmio_write(struct kvm_io_device *this,
-                                gpa_t addr, int len, const void *val)
+static int coalesced_mmio_write(struct kvm_io_device *this,
+                               gpa_t addr, int len, const void *val)
 {
        struct kvm_coalesced_mmio_dev *dev = to_mmio(this);
        struct kvm_coalesced_mmio_ring *ring = dev->kvm->coalesced_mmio_ring;
+       if (!coalesced_mmio_in_range(dev, addr, len))
+               return -EOPNOTSUPP;
 
        spin_lock(&dev->lock);
 
@@ -76,6 +75,7 @@ static void coalesced_mmio_write(struct kvm_io_device *this,
        smp_wmb();
        ring->last = (ring->last + 1) % KVM_COALESCED_MMIO_MAX;
        spin_unlock(&dev->lock);
+       return 0;
 }
 
 static void coalesced_mmio_destructor(struct kvm_io_device *this)
@@ -87,44 +87,70 @@ static void coalesced_mmio_destructor(struct kvm_io_device *this)
 
 static const struct kvm_io_device_ops coalesced_mmio_ops = {
        .write      = coalesced_mmio_write,
-       .in_range   = coalesced_mmio_in_range,
        .destructor = coalesced_mmio_destructor,
 };
 
 int kvm_coalesced_mmio_init(struct kvm *kvm)
 {
        struct kvm_coalesced_mmio_dev *dev;
+       struct page *page;
+       int ret;
+
+       ret = -ENOMEM;
+       page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+       if (!page)
+               goto out_err;
+       kvm->coalesced_mmio_ring = page_address(page);
 
+       ret = -ENOMEM;
        dev = kzalloc(sizeof(struct kvm_coalesced_mmio_dev), GFP_KERNEL);
        if (!dev)
-               return -ENOMEM;
+               goto out_free_page;
        spin_lock_init(&dev->lock);
        kvm_iodevice_init(&dev->dev, &coalesced_mmio_ops);
        dev->kvm = kvm;
        kvm->coalesced_mmio_dev = dev;
-       kvm_io_bus_register_dev(&kvm->mmio_bus, &dev->dev);
 
-       return 0;
+       mutex_lock(&kvm->slots_lock);
+       ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, &dev->dev);
+       mutex_unlock(&kvm->slots_lock);
+       if (ret < 0)
+               goto out_free_dev;
+
+       return ret;
+
+out_free_dev:
+       kfree(dev);
+out_free_page:
+       __free_page(page);
+out_err:
+       return ret;
+}
+
+void kvm_coalesced_mmio_free(struct kvm *kvm)
+{
+       if (kvm->coalesced_mmio_ring)
+               free_page((unsigned long)kvm->coalesced_mmio_ring);
 }
 
 int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
-                                        struct kvm_coalesced_mmio_zone *zone)
+                                        struct kvm_coalesced_mmio_zone *zone)
 {
        struct kvm_coalesced_mmio_dev *dev = kvm->coalesced_mmio_dev;
 
        if (dev == NULL)
                return -EINVAL;
 
-       down_write(&kvm->slots_lock);
+       mutex_lock(&kvm->slots_lock);
        if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) {
-               up_write(&kvm->slots_lock);
+               mutex_unlock(&kvm->slots_lock);
                return -ENOBUFS;
        }
 
        dev->zone[dev->nb_zones] = *zone;
        dev->nb_zones++;
 
-       up_write(&kvm->slots_lock);
+       mutex_unlock(&kvm->slots_lock);
        return 0;
 }
 
@@ -138,10 +164,10 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
        if (dev == NULL)
                return -EINVAL;
 
-       down_write(&kvm->slots_lock);
+       mutex_lock(&kvm->slots_lock);
 
        i = dev->nb_zones;
-       while(i) {
+       while (i) {
                z = &dev->zone[i - 1];
 
                /* unregister all zones
@@ -156,7 +182,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
                i--;
        }
 
-       up_write(&kvm->slots_lock);
+       mutex_unlock(&kvm->slots_lock);
 
        return 0;
 }