Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
  KVM: MMU: Use ptep_user for cmpxchg_gpte()
  KVM: Fix kvm mmu_notifier initialization order
  KVM: Add documentation for KVM_CAP_NR_VCPUS
  KVM: make guest mode entry to be rcu quiescent state
  KVM: x86 emulator: Make jmp far emulation into a separate function
  KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
  KVM: x86 emulator: Remove unused arg from emulate_pop()
  KVM: x86 emulator: Remove unused arg from writeback()
  KVM: x86 emulator: Remove unused arg from read_descriptor()
  KVM: x86 emulator: Remove unused arg from seg_override()
  KVM: Validate userspace_addr of memslot when registered
  KVM: MMU: Clean up gpte reading with copy_from_user()
  KVM: PPC: booke: add sregs support
  KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
  KVM: PPC: use ticks, not usecs, for exit timing
  KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
  KVM: PPC: e500: emulate SVR
  KVM: VMX: Cache vmcs segment fields
  KVM: x86 emulator: consolidate segment accessors
  KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
  ...

10 files changed, 309 insertions, 21 deletions

diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index 74d0e7421143..da3a1225c0ac 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -107,6 +107,16 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
         return 0;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        kvmppc_get_sregs_ivor(vcpu, sregs);
+}
+
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        return kvmppc_set_sregs_ivor(vcpu, sregs);
+}
+
 struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 {
         struct kvmppc_vcpu_44x *vcpu_44x;
diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
index 65ea083a5b27..549bb2c9a47a 100644
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c
@@ -158,7 +158,6 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                 emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);
         }
 
-        kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
         return emulated;
 }
 
@@ -179,7 +178,6 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);
         }
 
-        kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
         return emulated;
 }
 
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index ef76acb455c3..8462b3a1c1c7 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -569,6 +569,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         kvmppc_set_msr(vcpu, regs->msr);
         vcpu->arch.shared->srr0 = regs->srr0;
         vcpu->arch.shared->srr1 = regs->srr1;
+        kvmppc_set_pid(vcpu, regs->pid);
         vcpu->arch.shared->sprg0 = regs->sprg0;
         vcpu->arch.shared->sprg1 = regs->sprg1;
         vcpu->arch.shared->sprg2 = regs->sprg2;
@@ -584,16 +585,165 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         return 0;
 }
 
+static void get_sregs_base(struct kvm_vcpu *vcpu,
+                           struct kvm_sregs *sregs)
+{
+        u64 tb = get_tb();
+
+        sregs->u.e.features |= KVM_SREGS_E_BASE;
+
+        sregs->u.e.csrr0 = vcpu->arch.csrr0;
+        sregs->u.e.csrr1 = vcpu->arch.csrr1;
+        sregs->u.e.mcsr = vcpu->arch.mcsr;
+        sregs->u.e.esr = vcpu->arch.esr;
+        sregs->u.e.dear = vcpu->arch.shared->dar;
+        sregs->u.e.tsr = vcpu->arch.tsr;
+        sregs->u.e.tcr = vcpu->arch.tcr;
+        sregs->u.e.dec = kvmppc_get_dec(vcpu, tb);
+        sregs->u.e.tb = tb;
+        sregs->u.e.vrsave = vcpu->arch.vrsave;
+}
+
+static int set_sregs_base(struct kvm_vcpu *vcpu,
+                          struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_BASE))
+                return 0;
+
+        vcpu->arch.csrr0 = sregs->u.e.csrr0;
+        vcpu->arch.csrr1 = sregs->u.e.csrr1;
+        vcpu->arch.mcsr = sregs->u.e.mcsr;
+        vcpu->arch.esr = sregs->u.e.esr;
+        vcpu->arch.shared->dar = sregs->u.e.dear;
+        vcpu->arch.vrsave = sregs->u.e.vrsave;
+        vcpu->arch.tcr = sregs->u.e.tcr;
+
+        if (sregs->u.e.update_special & KVM_SREGS_E_UPDATE_DEC)
+                vcpu->arch.dec = sregs->u.e.dec;
+
+        kvmppc_emulate_dec(vcpu);
+
+        if (sregs->u.e.update_special & KVM_SREGS_E_UPDATE_TSR) {
+                /*
+                 * FIXME: existing KVM timer handling is incomplete.
+                 * TSR cannot be read by the guest, and its value in
+                 * vcpu->arch is always zero.  For now, just handle
+                 * the case where the caller is trying to inject a
+                 * decrementer interrupt.
+                 */
+
+                if ((sregs->u.e.tsr & TSR_DIS) &&
+                    (vcpu->arch.tcr & TCR_DIE))
+                        kvmppc_core_queue_dec(vcpu);
+        }
+
+        return 0;
+}
+
+static void get_sregs_arch206(struct kvm_vcpu *vcpu,
+                              struct kvm_sregs *sregs)
+{
+        sregs->u.e.features |= KVM_SREGS_E_ARCH206;
+
+        sregs->u.e.pir = 0;
+        sregs->u.e.mcsrr0 = vcpu->arch.mcsrr0;
+        sregs->u.e.mcsrr1 = vcpu->arch.mcsrr1;
+        sregs->u.e.decar = vcpu->arch.decar;
+        sregs->u.e.ivpr = vcpu->arch.ivpr;
+}
+
+static int set_sregs_arch206(struct kvm_vcpu *vcpu,
+                             struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_ARCH206))
+                return 0;
+
+        if (sregs->u.e.pir != 0)
+                return -EINVAL;
+
+        vcpu->arch.mcsrr0 = sregs->u.e.mcsrr0;
+        vcpu->arch.mcsrr1 = sregs->u.e.mcsrr1;
+        vcpu->arch.decar = sregs->u.e.decar;
+        vcpu->arch.ivpr = sregs->u.e.ivpr;
+
+        return 0;
+}
+
+void kvmppc_get_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        sregs->u.e.features |= KVM_SREGS_E_IVOR;
+
+        sregs->u.e.ivor_low[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL];
+        sregs->u.e.ivor_low[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK];
+        sregs->u.e.ivor_low[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE];
+        sregs->u.e.ivor_low[3] = vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE];
+        sregs->u.e.ivor_low[4] = vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL];
+        sregs->u.e.ivor_low[5] = vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT];
+        sregs->u.e.ivor_low[6] = vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM];
+        sregs->u.e.ivor_low[7] = vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL];
+        sregs->u.e.ivor_low[8] = vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL];
+        sregs->u.e.ivor_low[9] = vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL];
+        sregs->u.e.ivor_low[10] = vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER];
+        sregs->u.e.ivor_low[11] = vcpu->arch.ivor[BOOKE_IRQPRIO_FIT];
+        sregs->u.e.ivor_low[12] = vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG];
+        sregs->u.e.ivor_low[13] = vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS];
+        sregs->u.e.ivor_low[14] = vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS];
+        sregs->u.e.ivor_low[15] = vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG];
+}
+
+int kvmppc_set_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_IVOR))
+                return 0;
+
+        vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL] = sregs->u.e.ivor_low[0];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK] = sregs->u.e.ivor_low[1];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE] = sregs->u.e.ivor_low[2];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE] = sregs->u.e.ivor_low[3];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL] = sregs->u.e.ivor_low[4];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT] = sregs->u.e.ivor_low[5];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM] = sregs->u.e.ivor_low[6];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL] = sregs->u.e.ivor_low[7];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL] = sregs->u.e.ivor_low[8];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL] = sregs->u.e.ivor_low[9];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER] = sregs->u.e.ivor_low[10];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_FIT] = sregs->u.e.ivor_low[11];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG] = sregs->u.e.ivor_low[12];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS] = sregs->u.e.ivor_low[13];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS] = sregs->u.e.ivor_low[14];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG] = sregs->u.e.ivor_low[15];
+
+        return 0;
+}
+
 int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
                                   struct kvm_sregs *sregs)
 {
-        return -ENOTSUPP;
+        sregs->pvr = vcpu->arch.pvr;
+
+        get_sregs_base(vcpu, sregs);
+        get_sregs_arch206(vcpu, sregs);
+        kvmppc_core_get_sregs(vcpu, sregs);
+        return 0;
 }
 
 int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
                                   struct kvm_sregs *sregs)
 {
-        return -ENOTSUPP;
+        int ret;
+
+        if (vcpu->arch.pvr != sregs->pvr)
+                return -EINVAL;
+
+        ret = set_sregs_base(vcpu, sregs);
+        if (ret < 0)
+                return ret;
+
+        ret = set_sregs_arch206(vcpu, sregs);
+        if (ret < 0)
+                return ret;
+
+        return kvmppc_core_set_sregs(vcpu, sregs);
 }
 
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 1cc471faac2d..b58ccae95904 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -380,7 +380,6 @@ lightweight_exit:
          * because host interrupt handlers would get confused. */
         lwz     r1, VCPU_GPR(r1)(r4)
 
-        /* XXX handle USPRG0 */
         /* Host interrupt handlers may have clobbered these guest-readable
          * SPRGs, so we need to reload them here with the guest's values. */
         lwz     r3, VCPU_SPRG4(r4)
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index e3768ee9b595..318dbc61ba44 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -63,6 +63,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
 
         /* Registers init */
         vcpu->arch.pvr = mfspr(SPRN_PVR);
+        vcpu_e500->svr = mfspr(SPRN_SVR);
 
         /* Since booke kvm only support one core, update all vcpus' PIR to 0 */
         vcpu->vcpu_id = 0;
@@ -96,6 +97,81 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
         return 0;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        sregs->u.e.features |= KVM_SREGS_E_ARCH206_MMU | KVM_SREGS_E_SPE |
+                               KVM_SREGS_E_PM;
+        sregs->u.e.impl_id = KVM_SREGS_E_IMPL_FSL;
+
+        sregs->u.e.impl.fsl.features = 0;
+        sregs->u.e.impl.fsl.svr = vcpu_e500->svr;
+        sregs->u.e.impl.fsl.hid0 = vcpu_e500->hid0;
+        sregs->u.e.impl.fsl.mcar = vcpu_e500->mcar;
+
+        sregs->u.e.mas0 = vcpu_e500->mas0;
+        sregs->u.e.mas1 = vcpu_e500->mas1;
+        sregs->u.e.mas2 = vcpu_e500->mas2;
+        sregs->u.e.mas7_3 = ((u64)vcpu_e500->mas7 << 32) | vcpu_e500->mas3;
+        sregs->u.e.mas4 = vcpu_e500->mas4;
+        sregs->u.e.mas6 = vcpu_e500->mas6;
+
+        sregs->u.e.mmucfg = mfspr(SPRN_MMUCFG);
+        sregs->u.e.tlbcfg[0] = vcpu_e500->tlb0cfg;
+        sregs->u.e.tlbcfg[1] = vcpu_e500->tlb1cfg;
+        sregs->u.e.tlbcfg[2] = 0;
+        sregs->u.e.tlbcfg[3] = 0;
+
+        sregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];
+        sregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];
+        sregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];
+        sregs->u.e.ivor_high[3] =
+                vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];
+
+        kvmppc_get_sregs_ivor(vcpu, sregs);
+}
+
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        if (sregs->u.e.impl_id == KVM_SREGS_E_IMPL_FSL) {
+                vcpu_e500->svr = sregs->u.e.impl.fsl.svr;
+                vcpu_e500->hid0 = sregs->u.e.impl.fsl.hid0;
+                vcpu_e500->mcar = sregs->u.e.impl.fsl.mcar;
+        }
+
+        if (sregs->u.e.features & KVM_SREGS_E_ARCH206_MMU) {
+                vcpu_e500->mas0 = sregs->u.e.mas0;
+                vcpu_e500->mas1 = sregs->u.e.mas1;
+                vcpu_e500->mas2 = sregs->u.e.mas2;
+                vcpu_e500->mas7 = sregs->u.e.mas7_3 >> 32;
+                vcpu_e500->mas3 = (u32)sregs->u.e.mas7_3;
+                vcpu_e500->mas4 = sregs->u.e.mas4;
+                vcpu_e500->mas6 = sregs->u.e.mas6;
+        }
+
+        if (!(sregs->u.e.features & KVM_SREGS_E_IVOR))
+                return 0;
+
+        if (sregs->u.e.features & KVM_SREGS_E_SPE) {
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] =
+                        sregs->u.e.ivor_high[0];
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] =
+                        sregs->u.e.ivor_high[1];
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] =
+                        sregs->u.e.ivor_high[2];
+        }
+
+        if (sregs->u.e.features & KVM_SREGS_E_PM) {
+                vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR] =
+                        sregs->u.e.ivor_high[3];
+        }
+
+        return kvmppc_set_sregs_ivor(vcpu, sregs);
+}
+
 struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 {
         struct kvmppc_vcpu_e500 *vcpu_e500;
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 8e3edfbc9634..69cd665a0caf 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: Yu Liu, <yu.liu@freescale.com>
  *
@@ -78,8 +78,7 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
 
         switch (sprn) {
         case SPRN_PID:
-                vcpu_e500->pid[0] = vcpu->arch.shadow_pid =
-                        vcpu->arch.pid = spr_val;
+                kvmppc_set_pid(vcpu, spr_val);
                 break;
         case SPRN_PID1:
                 vcpu_e500->pid[1] = spr_val; break;
@@ -175,6 +174,8 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid0); break;
         case SPRN_HID1:
                 kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid1); break;
+        case SPRN_SVR:
+                kvmppc_set_gpr(vcpu, rt, vcpu_e500->svr); break;
 
         case SPRN_MMUCSR0:
                 kvmppc_set_gpr(vcpu, rt, 0); break;
diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index d6d6d47a75a9..b18fe353397d 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: Yu Liu, yu.liu@freescale.com
  *
@@ -24,6 +24,7 @@
 #include "../mm/mmu_decl.h"
 #include "e500_tlb.h"
 #include "trace.h"
+#include "timing.h"
 
 #define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1)
 
@@ -506,6 +507,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
                 vcpu_e500->mas7 = 0;
         }
 
+        kvmppc_set_exit_type(vcpu, EMULATED_TLBSX_EXITS);
         return EMULATE_DONE;
 }
 
@@ -571,6 +573,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
                 write_host_tlbe(vcpu_e500, stlbsel, sesel);
         }
 
+        kvmppc_set_exit_type(vcpu, EMULATED_TLBWE_EXITS);
         return EMULATE_DONE;
 }
 
@@ -672,6 +675,14 @@ int kvmppc_e500_tlb_search(struct kvm_vcpu *vcpu,
         return -1;
 }
 
+void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        vcpu_e500->pid[0] = vcpu->arch.shadow_pid =
+                vcpu->arch.pid = pid;
+}
+
 void kvmppc_e500_tlb_setup(struct kvmppc_vcpu_e500 *vcpu_e500)
 {
         struct tlbe *tlbe;
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index c64fd2909bb2..141dce3c6810 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -114,6 +114,12 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)
         }
 }
 
+u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb)
+{
+        u64 jd = tb - vcpu->arch.dec_jiffies;
+        return vcpu->arch.dec - jd;
+}
+
 /* XXX to do:
  * lhax
  * lhaux
@@ -279,11 +285,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 
                         case SPRN_DEC:
                         {
-                                u64 jd = get_tb() - vcpu->arch.dec_jiffies;
-                                kvmppc_set_gpr(vcpu, rt, vcpu->arch.dec - jd);
-                                pr_debug("mfDEC: %x - %llx = %lx\n",
-                                         vcpu->arch.dec, jd,
-                                         kvmppc_get_gpr(vcpu, rt));
+                                kvmppc_set_gpr(vcpu, rt,
+                                               kvmppc_get_dec(vcpu, get_tb()));
                                 break;
                         }
                         default:
@@ -294,6 +297,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                                 }
                                 break;
                         }
+                        kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
                         break;
 
                 case OP_31_XOP_STHX:
@@ -363,6 +367,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                                         printk("mtspr: unknown spr %x\n", sprn);
                                 break;
                         }
+                        kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
                         break;
 
                 case OP_31_XOP_DCBI:
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 99758460efde..616dd516ca1f 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -175,7 +175,11 @@ int kvm_dev_ioctl_check_extension(long ext)
         int r;
 
         switch (ext) {
+#ifdef CONFIG_BOOKE
+        case KVM_CAP_PPC_BOOKE_SREGS:
+#else
         case KVM_CAP_PPC_SEGSTATE:
+#endif
         case KVM_CAP_PPC_PAIRED_SINGLES:
         case KVM_CAP_PPC_UNSET_IRQ:
         case KVM_CAP_PPC_IRQ_LEVEL:
@@ -284,6 +288,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         tasklet_init(&vcpu->arch.tasklet, kvmppc_decrementer_func, (ulong)vcpu);
         vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;
 
+#ifdef CONFIG_KVM_EXIT_TIMING
+        mutex_init(&vcpu->arch.exit_timing_lock);
+#endif
+
         return 0;
 }
 
@@ -294,12 +302,25 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
 
 void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
+#ifdef CONFIG_BOOKE
+        /*
+         * vrsave (formerly usprg0) isn't used by Linux, but may
+         * be used by the guest.
+         *
+         * On non-booke this is associated with Altivec and
+         * is handled by code in book3s.c.
+         */
+        mtspr(SPRN_VRSAVE, vcpu->arch.vrsave);
+#endif
         kvmppc_core_vcpu_load(vcpu, cpu);
 }
 
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
         kvmppc_core_vcpu_put(vcpu);
+#ifdef CONFIG_BOOKE
+        vcpu->arch.vrsave = mfspr(SPRN_VRSAVE);
+#endif
 }
 
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
diff --git a/arch/powerpc/kvm/timing.c b/arch/powerpc/kvm/timing.c
index a021f5827a33..319177df9587 100644
--- a/arch/powerpc/kvm/timing.c
+++ b/arch/powerpc/kvm/timing.c
@@ -34,8 +34,8 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu)
 {
         int i;
 
-        /* pause guest execution to avoid concurrent updates */
-        mutex_lock(&vcpu->mutex);
+        /* Take a lock to avoid concurrent updates */
+        mutex_lock(&vcpu->arch.exit_timing_lock);
 
         vcpu->arch.last_exit_type = 0xDEAD;
         for (i = 0; i < __NUMBER_OF_KVM_EXIT_TYPES; i++) {
@@ -49,7 +49,7 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu)
         vcpu->arch.timing_exit.tv64 = 0;
         vcpu->arch.timing_last_enter.tv64 = 0;
 
-        mutex_unlock(&vcpu->mutex);
+        mutex_unlock(&vcpu->arch.exit_timing_lock);
 }
 
 static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
@@ -65,6 +65,8 @@ static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
                 return;
         }
 
+        mutex_lock(&vcpu->arch.exit_timing_lock);
+
         vcpu->arch.timing_count_type[type]++;
 
         /* sum */
@@ -93,6 +95,8 @@ static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
                 vcpu->arch.timing_min_duration[type] = duration;
         if (unlikely(duration > vcpu->arch.timing_max_duration[type]))
                 vcpu->arch.timing_max_duration[type] = duration;
+
+        mutex_unlock(&vcpu->arch.exit_timing_lock);
 }
 
 void kvmppc_update_timing_stats(struct kvm_vcpu *vcpu)
@@ -147,17 +151,30 @@ static int kvmppc_exit_timing_show(struct seq_file *m, void *private)
 {
         struct kvm_vcpu *vcpu = m->private;
         int i;
+        u64 min, max, sum, sum_quad;
 
         seq_printf(m, "%s", "type       count   min     max     sum     sum_squared\n");
 
+
         for (i = 0; i < __NUMBER_OF_KVM_EXIT_TYPES; i++) {
+
+                min = vcpu->arch.timing_min_duration[i];
+                do_div(min, tb_ticks_per_usec);
+                max = vcpu->arch.timing_max_duration[i];
+                do_div(max, tb_ticks_per_usec);
+                sum = vcpu->arch.timing_sum_duration[i];
+                do_div(sum, tb_ticks_per_usec);
+                sum_quad = vcpu->arch.timing_sum_quad_duration[i];
+                do_div(sum_quad, tb_ticks_per_usec);
+
                 seq_printf(m, "%12s     %10d    %10lld  %10lld  %20lld  %20lld\n",
                         kvm_exit_names[i],
                         vcpu->arch.timing_count_type[i],
-                        vcpu->arch.timing_min_duration[i],
-                        vcpu->arch.timing_max_duration[i],
-                        vcpu->arch.timing_sum_duration[i],
-                        vcpu->arch.timing_sum_quad_duration[i]);
+                        min,
+                        max,
+                        sum,
+                        sum_quad);
+
         }
         return 0;
 }