6 files changed, 61 insertions, 46 deletions

diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index ef3e7be29caf..fa4d1e59deb0 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -26,6 +26,7 @@ config KVM
         select ANON_INODES
         select HAVE_KVM_IRQCHIP
         select KVM_APIC_ARCHITECTURE
+        select KVM_MMIO
         ---help---
           Support hosting fully virtualized guest machines using hardware
           virtualization extensions.  You will need a fairly recent
@@ -47,6 +48,7 @@ config KVM_INTEL
           Provides support for KVM on Itanium 2 processors equipped with the VT
           extensions.
 
+source drivers/vhost/Kconfig
 source drivers/virtio/Kconfig
 
 endif # VIRTUALIZATION
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 5fdeec5fddcf..d5f4e9161201 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -23,8 +23,8 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/percpu.h>
-#include <linux/gfp.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/kvm_host.h>
 #include <linux/kvm.h>
@@ -241,10 +241,10 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         return 0;
 mmio:
         if (p->dir)
-                r = kvm_io_bus_read(&vcpu->kvm->mmio_bus, p->addr,
+                r = kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, p->addr,
                                     p->size, &p->data);
         else
-                r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,
+                r = kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, p->addr,
                                      p->size, &p->data);
         if (r)
                 printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);
@@ -636,12 +636,9 @@ static void kvm_vcpu_post_transition(struct kvm_vcpu *vcpu)
 static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         union context *host_ctx, *guest_ctx;
-        int r;
+        int r, idx;
 
-        /*
-         * down_read() may sleep and return with interrupts enabled
-         */
-        down_read(&vcpu->kvm->slots_lock);
+        idx = srcu_read_lock(&vcpu->kvm->srcu);
 
 again:
         if (signal_pending(current)) {
@@ -663,7 +660,7 @@ again:
         if (r < 0)
                 goto vcpu_run_fail;
 
-        up_read(&vcpu->kvm->slots_lock);
+        srcu_read_unlock(&vcpu->kvm->srcu, idx);
         kvm_guest_enter();
 
         /*
@@ -687,7 +684,7 @@ again:
         kvm_guest_exit();
         preempt_enable();
 
-        down_read(&vcpu->kvm->slots_lock);
+        idx = srcu_read_lock(&vcpu->kvm->srcu);
 
         r = kvm_handle_exit(kvm_run, vcpu);
 
@@ -697,10 +694,10 @@ again:
         }
 
 out:
-        up_read(&vcpu->kvm->slots_lock);
+        srcu_read_unlock(&vcpu->kvm->srcu, idx);
         if (r > 0) {
                 kvm_resched(vcpu);
-                down_read(&vcpu->kvm->slots_lock);
+                idx = srcu_read_lock(&vcpu->kvm->srcu);
                 goto again;
         }
 
@@ -971,7 +968,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 r = kvm_setup_default_irq_routing(kvm);
                 if (r) {
-                        kfree(kvm->arch.vioapic);
+                        kvm_ioapic_destroy(kvm);
                         goto out;
                 }
                 break;
@@ -982,11 +979,13 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&irq_event, argp, sizeof irq_event))
                         goto out;
+                r = -ENXIO;
                 if (irqchip_in_kernel(kvm)) {
                         __s32 status;
                         status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
                                     irq_event.irq, irq_event.level);
                         if (ioctl == KVM_IRQ_LINE_STATUS) {
+                                r = -EFAULT;
                                 irq_event.status = status;
                                 if (copy_to_user(argp, &irq_event,
                                                         sizeof irq_event))
@@ -1377,12 +1376,14 @@ static void free_kvm(struct kvm *kvm)
 
 static void kvm_release_vm_pages(struct kvm *kvm)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         int i, j;
         unsigned long base_gfn;
 
-        for (i = 0; i < kvm->nmemslots; i++) {
-                memslot = &kvm->memslots[i];
+        slots = kvm_memslots(kvm);
+        for (i = 0; i < slots->nmemslots; i++) {
+                memslot = &slots->memslots[i];
                 base_gfn = memslot->base_gfn;
 
                 for (j = 0; j < memslot->npages; j++) {
@@ -1405,6 +1406,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
         kfree(kvm->arch.vioapic);
         kvm_release_vm_pages(kvm);
         kvm_free_physmem(kvm);
+        cleanup_srcu_struct(&kvm->srcu);
         free_kvm(kvm);
 }
 
@@ -1535,8 +1537,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                         goto out;
 
                 if (copy_to_user(user_stack, stack,
-                                 sizeof(struct kvm_ia64_vcpu_stack)))
+                                 sizeof(struct kvm_ia64_vcpu_stack))) {
+                        r = -EFAULT;
                         goto out;
+                }
 
                 break;
         }
@@ -1576,15 +1580,15 @@ out:
         return r;
 }
 
-int kvm_arch_set_memory_region(struct kvm *kvm,
-                struct kvm_userspace_memory_region *mem,
+int kvm_arch_prepare_memory_region(struct kvm *kvm,
+                struct kvm_memory_slot *memslot,
                 struct kvm_memory_slot old,
+                struct kvm_userspace_memory_region *mem,
                 int user_alloc)
 {
         unsigned long i;
         unsigned long pfn;
-        int npages = mem->memory_size >> PAGE_SHIFT;
-        struct kvm_memory_slot *memslot = &kvm->memslots[mem->slot];
+        int npages = memslot->npages;
         unsigned long base_gfn = memslot->base_gfn;
 
         if (base_gfn + npages > (KVM_MAX_MEM_SIZE >> PAGE_SHIFT))
@@ -1608,6 +1612,14 @@ int kvm_arch_set_memory_region(struct kvm *kvm,
         return 0;
 }
 
+void kvm_arch_commit_memory_region(struct kvm *kvm,
+                struct kvm_userspace_memory_region *mem,
+                struct kvm_memory_slot old,
+                int user_alloc)
+{
+        return;
+}
+
 void kvm_arch_flush_shadow(struct kvm *kvm)
 {
         kvm_flush_remote_tlbs(kvm);
@@ -1794,7 +1806,8 @@ static int kvm_ia64_sync_dirty_log(struct kvm *kvm,
 {
         struct kvm_memory_slot *memslot;
         int r, i;
-        long n, base;
+        long base;
+        unsigned long n;
         unsigned long *dirty_bitmap = (unsigned long *)(kvm->arch.vm_base +
                         offsetof(struct kvm_vm_data, kvm_mem_dirty_log));
 
@@ -1802,12 +1815,12 @@ static int kvm_ia64_sync_dirty_log(struct kvm *kvm,
         if (log->slot >= KVM_MEMORY_SLOTS)
                 goto out;
 
-        memslot = &kvm->memslots[log->slot];
+        memslot = &kvm->memslots->memslots[log->slot];
         r = -ENOENT;
         if (!memslot->dirty_bitmap)
                 goto out;
 
-        n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;
+        n = kvm_dirty_bitmap_bytes(memslot);
         base = memslot->base_gfn / BITS_PER_LONG;
 
         for (i = 0; i < n/sizeof(long); ++i) {
@@ -1823,10 +1836,11 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
                 struct kvm_dirty_log *log)
 {
         int r;
-        int n;
+        unsigned long n;
         struct kvm_memory_slot *memslot;
         int is_dirty = 0;
 
+        mutex_lock(&kvm->slots_lock);
         spin_lock(&kvm->arch.dirty_log_lock);
 
         r = kvm_ia64_sync_dirty_log(kvm, log);
@@ -1840,12 +1854,13 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         /* If nothing is dirty, don't bother messing with page tables. */
         if (is_dirty) {
                 kvm_flush_remote_tlbs(kvm);
-                memslot = &kvm->memslots[log->slot];
-                n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;
+                memslot = &kvm->memslots->memslots[log->slot];
+                n = kvm_dirty_bitmap_bytes(memslot);
                 memset(memslot->dirty_bitmap, 0, n);
         }
         r = 0;
 out:
+        mutex_unlock(&kvm->slots_lock);
         spin_unlock(&kvm->arch.dirty_log_lock);
         return r;
 }
diff --git a/arch/ia64/kvm/kvm_fw.c b/arch/ia64/kvm/kvm_fw.c
index e4b82319881d..cb548ee9fcae 100644
--- a/arch/ia64/kvm/kvm_fw.c
+++ b/arch/ia64/kvm/kvm_fw.c
@@ -75,7 +75,7 @@ static void set_pal_result(struct kvm_vcpu *vcpu,
         struct exit_ctl_data *p;
 
         p = kvm_get_exit_data(vcpu);
-        if (p && p->exit_reason == EXIT_REASON_PAL_CALL) {
+        if (p->exit_reason == EXIT_REASON_PAL_CALL) {
                 p->u.pal_data.ret = result;
                 return ;
         }
@@ -87,7 +87,7 @@ static void set_sal_result(struct kvm_vcpu *vcpu,
         struct exit_ctl_data *p;
 
         p = kvm_get_exit_data(vcpu);
-        if (p && p->exit_reason == EXIT_REASON_SAL_CALL) {
+        if (p->exit_reason == EXIT_REASON_SAL_CALL) {
                 p->u.sal_data.ret = result;
                 return ;
         }
@@ -322,7 +322,7 @@ static  u64 kvm_get_pal_call_index(struct kvm_vcpu *vcpu)
         struct exit_ctl_data *p;
 
         p = kvm_get_exit_data(vcpu);
-        if (p && (p->exit_reason == EXIT_REASON_PAL_CALL))
+        if (p->exit_reason == EXIT_REASON_PAL_CALL)
                 index = p->u.pal_data.gr28;
 
         return index;
@@ -646,18 +646,16 @@ static void kvm_get_sal_call_data(struct kvm_vcpu *vcpu, u64 *in0, u64 *in1,
 
         p = kvm_get_exit_data(vcpu);
 
-        if (p) {
-                if (p->exit_reason == EXIT_REASON_SAL_CALL) {
-                        *in0 = p->u.sal_data.in0;
-                        *in1 = p->u.sal_data.in1;
-                        *in2 = p->u.sal_data.in2;
-                        *in3 = p->u.sal_data.in3;
-                        *in4 = p->u.sal_data.in4;
-                        *in5 = p->u.sal_data.in5;
-                        *in6 = p->u.sal_data.in6;
-                        *in7 = p->u.sal_data.in7;
-                        return ;
-                }
+        if (p->exit_reason == EXIT_REASON_SAL_CALL) {
+                *in0 = p->u.sal_data.in0;
+                *in1 = p->u.sal_data.in1;
+                *in2 = p->u.sal_data.in2;
+                *in3 = p->u.sal_data.in3;
+                *in4 = p->u.sal_data.in4;
+                *in5 = p->u.sal_data.in5;
+                *in6 = p->u.sal_data.in6;
+                *in7 = p->u.sal_data.in7;
+                return ;
         }
         *in0 = 0;
 }
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c
index 9bf55afd08d0..fb8f9f59a1ed 100644
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
@@ -316,8 +316,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma)
                 return;
         } else {
                 inst_type = -1;
-                panic_vm(vcpu, "Unsupported MMIO access instruction! \
-                                Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
+                panic_vm(vcpu, "Unsupported MMIO access instruction! "
+                                "Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
                                 bundle.i64[0], bundle.i64[1]);
         }
 
diff --git a/arch/ia64/kvm/vcpu.c b/arch/ia64/kvm/vcpu.c
index dce75b70cdd5..958815c9787d 100644
--- a/arch/ia64/kvm/vcpu.c
+++ b/arch/ia64/kvm/vcpu.c
@@ -1639,8 +1639,8 @@ void vcpu_set_psr(struct kvm_vcpu *vcpu, unsigned long val)
          * Otherwise panic
          */
         if (val & (IA64_PSR_PK | IA64_PSR_IS | IA64_PSR_VM))
-                panic_vm(vcpu, "Only support guests with vpsr.pk =0 \
-                                & vpsr.is=0\n");
+                panic_vm(vcpu, "Only support guests with vpsr.pk =0 "
+                                "& vpsr.is=0\n");
 
         /*
          * For those IA64_PSR bits: id/da/dd/ss/ed/ia
diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c
index 7a62f75778c5..f0b9cac82414 100644
--- a/arch/ia64/kvm/vmm.c
+++ b/arch/ia64/kvm/vmm.c
@@ -51,7 +51,7 @@ static int __init  kvm_vmm_init(void)
         vmm_fpswa_interface = fpswa_interface;
 
         /*Register vmm data to kvm side*/
-        return kvm_init(&vmm_info, 1024, THIS_MODULE);
+        return kvm_init(&vmm_info, 1024, 0, THIS_MODULE);
 }
 
 static void __exit kvm_vmm_exit(void)