Merge tag 'kvm-arm-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into 'kvm-next'

KVM/ARM changes for v4.1:

- fixes for live migration
- irqfd support
- kvm-io-bus & vgic rework to enable ioeventfd
- page ageing for stage-2 translation
- various cleanups

8 files changed, 250 insertions, 109 deletions

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 338ace78ed18..f1f79d104309 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -18,6 +18,7 @@ if VIRTUALIZATION
 
 config KVM
         bool "Kernel-based Virtual Machine (KVM) support"
+        depends on MMU && OF
         select PREEMPT_NOTIFIERS
         select ANON_INODES
         select HAVE_KVM_CPU_RELAX_INTERCEPT
@@ -26,10 +27,12 @@ config KVM
         select KVM_ARM_HOST
         select KVM_GENERIC_DIRTYLOG_READ_PROTECT
         select SRCU
-        depends on ARM_VIRT_EXT && ARM_LPAE
+        select MMU_NOTIFIER
+        select HAVE_KVM_EVENTFD
+        select HAVE_KVM_IRQFD
+        depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER
         ---help---
-          Support hosting virtualized guest machines. You will also
-          need to select one or more of the processor modules below.
+          Support hosting virtualized guest machines.
 
           This module provides access to the hardware capabilities through
           a character device node named /dev/kvm.
@@ -37,10 +40,7 @@ config KVM
           If unsure, say N.
 
 config KVM_ARM_HOST
-        bool "KVM host support for ARM cpus."
-        depends on KVM
-        depends on MMU
-        select  MMU_NOTIFIER
+        bool
         ---help---
           Provides host support for ARM processors.
 
@@ -55,20 +55,4 @@ config KVM_ARM_MAX_VCPUS
           large, so only choose a reasonable number that you expect to
           actually use.
 
-config KVM_ARM_VGIC
-        bool "KVM support for Virtual GIC"
-        depends on KVM_ARM_HOST && OF
-        select HAVE_KVM_IRQCHIP
-        default y
-        ---help---
-          Adds support for a hardware assisted, in-kernel GIC emulation.
-
-config KVM_ARM_TIMER
-        bool "KVM support for Architected Timers"
-        depends on KVM_ARM_VGIC && ARM_ARCH_TIMER
-        select HAVE_KVM_IRQCHIP
-        default y
-        ---help---
-          Adds support for the Architected Timers in virtual machines
-
 endif # VIRTUALIZATION
diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile
index 443b8bea43e9..139e46c08b6e 100644
--- a/arch/arm/kvm/Makefile
+++ b/arch/arm/kvm/Makefile
@@ -7,7 +7,7 @@ ifeq ($(plus_virt),+virt)
         plus_virt_def := -DREQUIRES_VIRT=1
 endif
 
-ccflags-y += -Ivirt/kvm -Iarch/arm/kvm
+ccflags-y += -Iarch/arm/kvm
 CFLAGS_arm.o := -I. $(plus_virt_def)
 CFLAGS_mmu.o := -I.
 
@@ -15,12 +15,12 @@ AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt)
 AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt)
 
 KVM := ../../../virt/kvm
-kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
+kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o
 
 obj-y += kvm-arm.o init.o interrupts.o
 obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o
 obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o
-obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o
-obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o
-obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2-emul.o
-obj-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o
+obj-y += $(KVM)/arm/vgic.o
+obj-y += $(KVM)/arm/vgic-v2.o
+obj-y += $(KVM)/arm/vgic-v2-emul.o
+obj-y += $(KVM)/arm/arch_timer.o
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 5560f74f9eee..6f536451ab78 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -61,8 +61,6 @@ static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
 static u8 kvm_next_vmid;
 static DEFINE_SPINLOCK(kvm_vmid_lock);
 
-static bool vgic_present;
-
 static void kvm_arm_set_running_vcpu(struct kvm_vcpu *vcpu)
 {
         BUG_ON(preemptible());
@@ -173,8 +171,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
         int r;
         switch (ext) {
         case KVM_CAP_IRQCHIP:
-                r = vgic_present;
-                break;
+        case KVM_CAP_IRQFD:
+        case KVM_CAP_IOEVENTFD:
         case KVM_CAP_DEVICE_CTRL:
         case KVM_CAP_USER_MEMORY:
         case KVM_CAP_SYNC_MMU:
@@ -183,6 +181,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
         case KVM_CAP_ARM_PSCI:
         case KVM_CAP_ARM_PSCI_0_2:
         case KVM_CAP_READONLY_MEM:
+        case KVM_CAP_MP_STATE:
                 r = 1;
                 break;
         case KVM_CAP_COALESCED_MMIO:
@@ -268,7 +267,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 
 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
 {
-        return 0;
+        return kvm_timer_should_fire(vcpu);
 }
 
 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
@@ -313,13 +312,29 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {
-        return -EINVAL;
+        if (vcpu->arch.pause)
+                mp_state->mp_state = KVM_MP_STATE_STOPPED;
+        else
+                mp_state->mp_state = KVM_MP_STATE_RUNNABLE;
+
+        return 0;
 }
 
 int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {
-        return -EINVAL;
+        switch (mp_state->mp_state) {
+        case KVM_MP_STATE_RUNNABLE:
+                vcpu->arch.pause = false;
+                break;
+        case KVM_MP_STATE_STOPPED:
+                vcpu->arch.pause = true;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
 }
 
 /**
@@ -452,6 +467,11 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
         return 0;
 }