Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 "On the x86 side, there are some optimizations and documentation
  updates.  The big ARM/KVM change for 3.11, support for AArch64, will
  come through Catalin Marinas's tree.  s390 and PPC have misc cleanups
  and bugfixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (87 commits)
  KVM: PPC: Ignore PIR writes
  KVM: PPC: Book3S PR: Invalidate SLB entries properly
  KVM: PPC: Book3S PR: Allow guest to use 1TB segments
  KVM: PPC: Book3S PR: Don't keep scanning HPTEG after we find a match
  KVM: PPC: Book3S PR: Fix invalidation of SLB entry 0 on guest entry
  KVM: PPC: Book3S PR: Fix proto-VSID calculations
  KVM: PPC: Guard doorbell exception with CONFIG_PPC_DOORBELL
  KVM: Fix RTC interrupt coalescing tracking
  kvm: Add a tracepoint write_tsc_offset
  KVM: MMU: Inform users of mmio generation wraparound
  KVM: MMU: document fast invalidate all mmio sptes
  KVM: MMU: document fast invalidate all pages
  KVM: MMU: document fast page fault
  KVM: MMU: document mmio page fault
  KVM: MMU: document write_flooding_count
  KVM: MMU: document clear_spte_count
  KVM: MMU: drop kvm_mmu_zap_mmio_sptes
  KVM: MMU: init kvm generation close to mmio wrap-around value
  KVM: MMU: add tracepoint for check_mmio_spte
  KVM: MMU: fast invalidate all mmio sptes
  ...

3 files changed, 64 insertions, 47 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 16bd5d169cdb..3238d4004e84 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -62,13 +62,20 @@ struct sca_block {
 #define CPUSTAT_MCDS       0x00000100
 #define CPUSTAT_SM         0x00000080
 #define CPUSTAT_G          0x00000008
+#define CPUSTAT_GED        0x00000004
 #define CPUSTAT_J          0x00000002
 #define CPUSTAT_P          0x00000001
 
 struct kvm_s390_sie_block {
         atomic_t cpuflags;              /* 0x0000 */
         __u32   prefix;                 /* 0x0004 */
-        __u8    reserved8[32];          /* 0x0008 */
+        __u8    reserved08[4];          /* 0x0008 */
+#define PROG_IN_SIE (1<<0)
+        __u32   prog0c;                 /* 0x000c */
+        __u8    reserved10[16];         /* 0x0010 */
+#define PROG_BLOCK_SIE 0x00000001
+        atomic_t prog20;                /* 0x0020 */
+        __u8    reserved24[4];          /* 0x0024 */
         __u64   cputm;                  /* 0x0028 */
         __u64   ckc;                    /* 0x0030 */
         __u64   epoch;                  /* 0x0038 */
@@ -90,7 +97,8 @@ struct kvm_s390_sie_block {
         __u32   scaoh;                  /* 0x005c */
         __u8    reserved60;             /* 0x0060 */
         __u8    ecb;                    /* 0x0061 */
-        __u8    reserved62[2];          /* 0x0062 */
+        __u8    ecb2;                   /* 0x0062 */
+        __u8    reserved63[1];          /* 0x0063 */
         __u32   scaol;                  /* 0x0064 */
         __u8    reserved68[4];          /* 0x0068 */
         __u32   todpr;                  /* 0x006c */
@@ -130,6 +138,7 @@ struct kvm_vcpu_stat {
         u32 deliver_program_int;
         u32 deliver_io_int;
         u32 exit_wait_state;
+        u32 instruction_pfmf;
         u32 instruction_stidp;
         u32 instruction_spx;
         u32 instruction_stpx;
@@ -166,7 +175,7 @@ struct kvm_s390_ext_info {
 };
 
 #define PGM_OPERATION            0x01
-#define PGM_PRIVILEGED_OPERATION 0x02
+#define PGM_PRIVILEGED_OP        0x02
 #define PGM_EXECUTE              0x03
 #define PGM_PROTECTION           0x04
 #define PGM_ADDRESSING           0x05
@@ -219,7 +228,7 @@ struct kvm_s390_local_interrupt {
         atomic_t active;
         struct kvm_s390_float_interrupt *float_int;
         int timer_due; /* event indicator for waitqueue below */
-        wait_queue_head_t wq;
+        wait_queue_head_t *wq;
         atomic_t *cpuflags;
         unsigned int action_bits;
 };
@@ -266,4 +275,5 @@ struct kvm_arch{
 };
 
 extern int sie64a(struct kvm_s390_sie_block *, u64 *);
+extern char sie_exit;
 #endif
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
index 5f0173a31693..1141fb3e7b21 100644
--- a/arch/s390/include/asm/perf_event.h
+++ b/arch/s390/include/asm/perf_event.h
@@ -14,3 +14,13 @@
 /* Per-CPU flags for PMU states */
 #define PMU_F_RESERVED                  0x1000
 #define PMU_F_ENABLED                   0x2000
+
+#ifdef CONFIG_64BIT
+
+/* Perf callbacks */
+struct pt_regs;
+extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
+extern unsigned long perf_misc_flags(struct pt_regs *regs);
+#define perf_misc_flags(regs) perf_misc_flags(regs)
+
+#endif /* CONFIG_64BIT */
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 9aefa3c64eb2..0ea4e591fa78 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -296,18 +296,16 @@ extern unsigned long MODULES_END;
 #define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INV)
 
 /* Page status table bits for virtualization */
-#define RCP_ACC_BITS    0xf0000000UL
-#define RCP_FP_BIT      0x08000000UL
-#define RCP_PCL_BIT     0x00800000UL
-#define RCP_HR_BIT      0x00400000UL
-#define RCP_HC_BIT      0x00200000UL
-#define RCP_GR_BIT      0x00040000UL
-#define RCP_GC_BIT      0x00020000UL
-#define RCP_IN_BIT      0x00002000UL    /* IPTE notify bit */
-
-/* User dirty / referenced bit for KVM's migration feature */
-#define KVM_UR_BIT      0x00008000UL
-#define KVM_UC_BIT      0x00004000UL
+#define PGSTE_ACC_BITS  0xf0000000UL
+#define PGSTE_FP_BIT    0x08000000UL
+#define PGSTE_PCL_BIT   0x00800000UL
+#define PGSTE_HR_BIT    0x00400000UL
+#define PGSTE_HC_BIT    0x00200000UL
+#define PGSTE_GR_BIT    0x00040000UL
+#define PGSTE_GC_BIT    0x00020000UL
+#define PGSTE_UR_BIT    0x00008000UL
+#define PGSTE_UC_BIT    0x00004000UL    /* user dirty (migration) */
+#define PGSTE_IN_BIT    0x00002000UL    /* IPTE notify bit */
 
 #else /* CONFIG_64BIT */
 
@@ -364,18 +362,16 @@ extern unsigned long MODULES_END;
                                  | _SEGMENT_ENTRY_SPLIT | _SEGMENT_ENTRY_CO)
 
 /* Page status table bits for virtualization */
-#define RCP_ACC_BITS    0xf000000000000000UL
-#define RCP_FP_BIT      0x0800000000000000UL
-#define RCP_PCL_BIT     0x0080000000000000UL
-#define RCP_HR_BIT      0x0040000000000000UL
-#define RCP_HC_BIT      0x0020000000000000UL
-#define RCP_GR_BIT      0x0004000000000000UL
-#define RCP_GC_BIT      0x0002000000000000UL
-#define RCP_IN_BIT      0x0000200000000000UL    /* IPTE notify bit */
-
-/* User dirty / referenced bit for KVM's migration feature */
-#define KVM_UR_BIT      0x0000800000000000UL
-#define KVM_UC_BIT      0x0000400000000000UL
+#define PGSTE_ACC_BITS  0xf000000000000000UL
+#define PGSTE_FP_BIT    0x0800000000000000UL
+#define PGSTE_PCL_BIT   0x0080000000000000UL
+#define PGSTE_HR_BIT    0x0040000000000000UL
+#define PGSTE_HC_BIT    0x0020000000000000UL
+#define PGSTE_GR_BIT    0x0004000000000000UL
+#define PGSTE_GC_BIT    0x0002000000000000UL
+#define PGSTE_UR_BIT    0x0000800000000000UL
+#define PGSTE_UC_BIT    0x0000400000000000UL    /* user dirty (migration) */
+#define PGSTE_IN_BIT    0x0000200000000000UL    /* IPTE notify bit */
 
 #endif /* CONFIG_64BIT */
 
@@ -615,8 +611,8 @@ static inline pgste_t pgste_get_lock(pte_t *ptep)
         asm(
                 "       lg      %0,%2\n"
                 "0:     lgr     %1,%0\n"
-                "       nihh    %0,0xff7f\n"    /* clear RCP_PCL_BIT in old */
-                "       oihh    %1,0x0080\n"    /* set RCP_PCL_BIT in new */
+                "       nihh    %0,0xff7f\n"    /* clear PCL bit in old */
+                "       oihh    %1,0x0080\n"    /* set PCL bit in new */
                 "       csg     %0,%1,%2\n"
                 "       jl      0b\n"
                 : "=&d" (old), "=&d" (new), "=Q" (ptep[PTRS_PER_PTE])
@@ -629,7 +625,7 @@ static inline void pgste_set_unlock(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
         asm(
-                "       nihh    %1,0xff7f\n"    /* clear RCP_PCL_BIT */
+                "       nihh    %1,0xff7f\n"    /* clear PCL bit */
                 "       stg     %1,%0\n"
                 : "=Q" (ptep[PTRS_PER_PTE])
                 : "d" (pgste_val(pgste)), "Q" (ptep[PTRS_PER_PTE])
@@ -662,14 +658,14 @@ static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
         else if (bits)
                 page_reset_referenced(address);
         /* Transfer page changed & referenced bit to guest bits in pgste */
-        pgste_val(pgste) |= bits << 48;         /* RCP_GR_BIT & RCP_GC_BIT */
+        pgste_val(pgste) |= bits << 48;         /* GR bit & GC bit */
         /* Get host changed & referenced bits from pgste */
-        bits |= (pgste_val(pgste) & (RCP_HR_BIT | RCP_HC_BIT)) >> 52;
+        bits |= (pgste_val(pgste) & (PGSTE_HR_BIT | PGSTE_HC_BIT)) >> 52;
         /* Transfer page changed & referenced bit to kvm user bits */
-        pgste_val(pgste) |= bits << 45;         /* KVM_UR_BIT & KVM_UC_BIT */
+        pgste_val(pgste) |= bits << 45;         /* PGSTE_UR_BIT & PGSTE_UC_BIT */
         /* Clear relevant host bits in pgste. */
-        pgste_val(pgste) &= ~(RCP_HR_BIT | RCP_HC_BIT);
-        pgste_val(pgste) &= ~(RCP_ACC_BITS | RCP_FP_BIT);
+        pgste_val(pgste) &= ~(PGSTE_HR_BIT | PGSTE_HC_BIT);
+        pgste_val(pgste) &= ~(PGSTE_ACC_BITS | PGSTE_FP_BIT);
         /* Copy page access key and fetch protection bit to pgste */
         pgste_val(pgste) |=
                 (unsigned long) (skey & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
@@ -690,15 +686,15 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
         /* Get referenced bit from storage key */
         young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);
         if (young)
-                pgste_val(pgste) |= RCP_GR_BIT;
+                pgste_val(pgste) |= PGSTE_GR_BIT;
         /* Get host referenced bit from pgste */
-        if (pgste_val(pgste) & RCP_HR_BIT) {
-                pgste_val(pgste) &= ~RCP_HR_BIT;
+        if (pgste_val(pgste) & PGSTE_HR_BIT) {
+                pgste_val(pgste) &= ~PGSTE_HR_BIT;
                 young = 1;
         }
         /* Transfer referenced bit to kvm user bits and pte */
         if (young) {
-                pgste_val(pgste) |= KVM_UR_BIT;
+                pgste_val(pgste) |= PGSTE_UR_BIT;
                 pte_val(*ptep) |= _PAGE_SWR;
         }
 #endif
@@ -720,7 +716,7 @@ static inline void pgste_set_key(pte_t *ptep, pgste_t pgste, pte_t entry)
          * The guest C/R information is still in the PGSTE, set real
          * key C/R to 0.
          */
-        nkey = (pgste_val(pgste) & (RCP_ACC_BITS | RCP_FP_BIT)) >> 56;
+        nkey = (pgste_val(pgste) & (PGSTE_ACC_BITS | PGSTE_FP_BIT)) >> 56;
         page_set_storage_key(address, nkey, 0);
 #endif
 }
@@ -750,6 +746,7 @@ struct gmap {
         struct mm_struct *mm;
         unsigned long *table;
         unsigned long asce;
+        void *private;
         struct list_head crst_list;
 };
 
@@ -808,8 +805,8 @@ static inline pgste_t pgste_ipte_notify(struct mm_struct *mm,
                                         pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        if (pgste_val(pgste) & RCP_IN_BIT) {
-                pgste_val(pgste) &= ~RCP_IN_BIT;
+        if (pgste_val(pgste) & PGSTE_IN_BIT) {
+                pgste_val(pgste) &= ~PGSTE_IN_BIT;
                 gmap_do_ipte_notify(mm, addr, ptep);
         }
 #endif
@@ -977,8 +974,8 @@ static inline int ptep_test_and_clear_user_dirty(struct mm_struct *mm,
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste = pgste_update_all(ptep, pgste);
-                dirty = !!(pgste_val(pgste) & KVM_UC_BIT);
-                pgste_val(pgste) &= ~KVM_UC_BIT;
+                dirty = !!(pgste_val(pgste) & PGSTE_UC_BIT);
+                pgste_val(pgste) &= ~PGSTE_UC_BIT;
                 pgste_set_unlock(ptep, pgste);
                 return dirty;
         }
@@ -997,8 +994,8 @@ static inline int ptep_test_and_clear_user_young(struct mm_struct *mm,
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste = pgste_update_young(ptep, pgste);
-                young = !!(pgste_val(pgste) & KVM_UR_BIT);
-                pgste_val(pgste) &= ~KVM_UR_BIT;
+                young = !!(pgste_val(pgste) & PGSTE_UR_BIT);
+                pgste_val(pgste) &= ~PGSTE_UR_BIT;
                 pgste_set_unlock(ptep, pgste);
         }
         return young;