Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM changes from Avi Kivity:
 "Changes include additional instruction emulation, page-crossing MMIO,
  faster dirty logging, preventing the watchdog from killing a stopped
  guest, module autoload, a new MSI ABI, and some minor optimizations
  and fixes.  Outside x86 we have a small s390 and a very large ppc
  update.

  Regarding the new (for kvm) rebaseless workflow, some of the patches
  that were merged before we switch trees had to be rebased, while
  others are true pulls.  In either case the signoffs should be correct
  now."

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
arch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.

I suspect the kvm_para.h resolution ends up doing the "do I have cpuid"
check effectively twice (it was done differently in two different
commits), but better safe than sorry ;)

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)
  KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block
  KVM: s390: onereg for timer related registers
  KVM: s390: epoch difference and TOD programmable field
  KVM: s390: KVM_GET/SET_ONEREG for s390
  KVM: s390: add capability indicating COW support
  KVM: Fix mmu_reload() clash with nested vmx event injection
  KVM: MMU: Don't use RCU for lockless shadow walking
  KVM: VMX: Optimize %ds, %es reload
  KVM: VMX: Fix %ds/%es clobber
  KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()
  KVM: VMX: unlike vmcs on fail path
  KVM: PPC: Emulator: clean up SPR reads and writes
  KVM: PPC: Emulator: clean up instruction parsing
  kvm/powerpc: Add new ioctl to retreive server MMU infos
  kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM
  KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler
  KVM: PPC: Book3S: Enable IRQs during exit handling
  KVM: PPC: Fix PR KVM on POWER7 bare metal
  KVM: PPC: Fix stbux emulation
  KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields
  ...

1 files changed, 74 insertions, 44 deletions

diff --git a/arch/powerpc/kvm/booke_emulate.c b/arch/powerpc/kvm/booke_emulate.c
index 3e652da3653..6c76397f2af 100644
--- a/arch/powerpc/kvm/booke_emulate.c
+++ b/arch/powerpc/kvm/booke_emulate.c
@@ -40,8 +40,8 @@ int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                             unsigned int inst, int *advance)
 {
         int emulated = EMULATE_DONE;
-        int rs;
-        int rt;
+        int rs = get_rs(inst);
+        int rt = get_rt(inst);
 
         switch (get_op(inst)) {
         case 19:
@@ -62,19 +62,16 @@ int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 switch (get_xop(inst)) {
 
                 case OP_31_XOP_MFMSR:
-                        rt = get_rt(inst);
                         kvmppc_set_gpr(vcpu, rt, vcpu->arch.shared->msr);
                         kvmppc_set_exit_type(vcpu, EMULATED_MFMSR_EXITS);
                         break;
 
                 case OP_31_XOP_MTMSR:
-                        rs = get_rs(inst);
                         kvmppc_set_exit_type(vcpu, EMULATED_MTMSR_EXITS);
                         kvmppc_set_msr(vcpu, kvmppc_get_gpr(vcpu, rs));
                         break;
 
                 case OP_31_XOP_WRTEE:
-                        rs = get_rs(inst);
                         vcpu->arch.shared->msr = (vcpu->arch.shared->msr & ~MSR_EE)
                                         | (kvmppc_get_gpr(vcpu, rs) & MSR_EE);
                         kvmppc_set_exit_type(vcpu, EMULATED_WRTEE_EXITS);
@@ -99,22 +96,32 @@ int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
         return emulated;
 }
 
-int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
+/*
+ * NOTE: some of these registers are not emulated on BOOKE_HV (GS-mode).
+ * Their backing store is in real registers, and these functions
+ * will return the wrong result if called for them in another context
+ * (such as debugging).
+ */
+int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
 {
         int emulated = EMULATE_DONE;
-        ulong spr_val = kvmppc_get_gpr(vcpu, rs);
 
         switch (sprn) {
         case SPRN_DEAR:
-                vcpu->arch.shared->dar = spr_val; break;
+                vcpu->arch.shared->dar = spr_val;
+                break;
         case SPRN_ESR:
-                vcpu->arch.shared->esr = spr_val; break;
+                vcpu->arch.shared->esr = spr_val;
+                break;
         case SPRN_DBCR0:
-                vcpu->arch.dbcr0 = spr_val; break;
+                vcpu->arch.dbcr0 = spr_val;
+                break;
         case SPRN_DBCR1:
-                vcpu->arch.dbcr1 = spr_val; break;
+                vcpu->arch.dbcr1 = spr_val;
+                break;
         case SPRN_DBSR:
-                vcpu->arch.dbsr &= ~spr_val; break;
+                vcpu->arch.dbsr &= ~spr_val;
+                break;
         case SPRN_TSR:
                 kvmppc_clr_tsr_bits(vcpu, spr_val);
                 break;
@@ -122,20 +129,29 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                 kvmppc_set_tcr(vcpu, spr_val);
                 break;
 
-        /* Note: SPRG4-7 are user-readable. These values are
-         * loaded into the real SPRGs when resuming the
-         * guest. */
+        /*
+         * Note: SPRG4-7 are user-readable.
+         * These values are loaded into the real SPRGs when resuming the
+         * guest (PR-mode only).
+         */
         case SPRN_SPRG4:
-                vcpu->arch.shared->sprg4 = spr_val; break;
+                vcpu->arch.shared->sprg4 = spr_val;
+                break;
         case SPRN_SPRG5:
-                vcpu->arch.shared->sprg5 = spr_val; break;
+                vcpu->arch.shared->sprg5 = spr_val;
+                break;
         case SPRN_SPRG6:
-                vcpu->arch.shared->sprg6 = spr_val; break;
+                vcpu->arch.shared->sprg6 = spr_val;
+                break;
         case SPRN_SPRG7:
-                vcpu->arch.shared->sprg7 = spr_val; break;
+                vcpu->arch.shared->sprg7 = spr_val;
+                break;
 
         case SPRN_IVPR:
                 vcpu->arch.ivpr = spr_val;
+#ifdef CONFIG_KVM_BOOKE_HV
+                mtspr(SPRN_GIVPR, spr_val);
+#endif
                 break;
         case SPRN_IVOR0:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL] = spr_val;
@@ -145,6 +161,9 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                 break;
         case SPRN_IVOR2:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE] = spr_val;
+#ifdef CONFIG_KVM_BOOKE_HV
+                mtspr(SPRN_GIVOR2, spr_val);
+#endif
                 break;
         case SPRN_IVOR3:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE] = spr_val;
@@ -163,6 +182,9 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                 break;
         case SPRN_IVOR8:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL] = spr_val;
+#ifdef CONFIG_KVM_BOOKE_HV
+                mtspr(SPRN_GIVOR8, spr_val);
+#endif
                 break;
         case SPRN_IVOR9:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL] = spr_val;
@@ -193,75 +215,83 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
         return emulated;
 }
 
-int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
+int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)
 {
         int emulated = EMULATE_DONE;
 
         switch (sprn) {
         case SPRN_IVPR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivpr); break;
+                *spr_val = vcpu->arch.ivpr;
+                break;
         case SPRN_DEAR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.shared->dar); break;
+                *spr_val = vcpu->arch.shared->dar;
+                break;
         case SPRN_ESR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.shared->esr); break;
+                *spr_val = vcpu->arch.shared->esr;
+                break;
         case SPRN_DBCR0:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.dbcr0); break;
+                *spr_val = vcpu->arch.dbcr0;
+                break;
         case SPRN_DBCR1:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.dbcr1); break;
+                *spr_val = vcpu->arch.dbcr1;
+                break;
         case SPRN_DBSR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.dbsr); break;
+                *spr_val = vcpu->arch.dbsr;
+                break;
         case SPRN_TSR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.tsr); break;
+                *spr_val = vcpu->arch.tsr;
+                break;
         case SPRN_TCR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.tcr); break;
+                *spr_val = vcpu->arch.tcr;
+                break;
 
         case SPRN_IVOR0:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL];
                 break;
         case SPRN_IVOR1:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK];
                 break;
         case SPRN_IVOR2:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE];
                 break;
         case SPRN_IVOR3:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE];
                 break;
         case SPRN_IVOR4:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL];
                 break;
         case SPRN_IVOR5:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT];
                 break;
         case SPRN_IVOR6:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM];
                 break;
         case SPRN_IVOR7:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL];
                 break;
         case SPRN_IVOR8:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL];
                 break;
         case SPRN_IVOR9:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL];
                 break;
         case SPRN_IVOR10:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER];
                 break;
         case SPRN_IVOR11:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_FIT]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_FIT];
                 break;
         case SPRN_IVOR12:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG];
                 break;
         case SPRN_IVOR13:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS];
                 break;
         case SPRN_IVOR14:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS];
                 break;
         case SPRN_IVOR15:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG]);
+                *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG];
                 break;
 
         default: