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

Pull KVM update from Paolo Bonzini:
 "3.19 changes for KVM:

   - spring cleaning: removed support for IA64, and for hardware-
     assisted virtualization on the PPC970

   - ARM, PPC, s390 all had only small fixes

  For x86:
   - small performance improvements (though only on weird guests)
   - usual round of hardware-compliancy fixes from Nadav
   - APICv fixes
   - XSAVES support for hosts and guests.  XSAVES hosts were broken
     because the (non-KVM) XSAVES patches inadvertently changed the KVM
     userspace ABI whenever XSAVES was enabled; hence, this part is
     going to stable.  Guest support is just a matter of exposing the
     feature and CPUID leaves support"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (179 commits)
  KVM: move APIC types to arch/x86/
  KVM: PPC: Book3S: Enable in-kernel XICS emulation by default
  KVM: PPC: Book3S HV: Improve H_CONFER implementation
  KVM: PPC: Book3S HV: Fix endianness of instruction obtained from HEIR register
  KVM: PPC: Book3S HV: Remove code for PPC970 processors
  KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions
  KVM: PPC: Book3S HV: Simplify locking around stolen time calculations
  arch: powerpc: kvm: book3s_paired_singles.c: Remove unused function
  arch: powerpc: kvm: book3s_pr.c: Remove unused function
  arch: powerpc: kvm: book3s.c: Remove some unused functions
  arch: powerpc: kvm: book3s_32_mmu.c: Remove unused function
  KVM: PPC: Book3S HV: Check wait conditions before sleeping in kvmppc_vcore_blocked
  KVM: PPC: Book3S HV: ptes are big endian
  KVM: PPC: Book3S HV: Fix inaccuracies in ICP emulation for H_IPI
  KVM: PPC: Book3S HV: Fix KSM memory corruption
  KVM: PPC: Book3S HV: Fix an issue where guest is paused on receiving HMI
  KVM: PPC: Book3S HV: Fix computation of tlbie operand
  KVM: PPC: Book3S HV: Add missing HPTE unlock
  KVM: PPC: BookE: Improve irq inject tracepoint
  arm/arm64: KVM: Require in-kernel vgic for the arch timers
  ...

3 files changed, 98 insertions, 3 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 2175f911a73a..9cba74d5d853 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -123,7 +123,7 @@ struct kvm_s390_sie_block {
 #define ICPT_PARTEXEC   0x38
 #define ICPT_IOINST     0x40
         __u8    icptcode;               /* 0x0050 */
-        __u8    reserved51;             /* 0x0051 */
+        __u8    icptstatus;             /* 0x0051 */
         __u16   ihcpu;                  /* 0x0052 */
         __u8    reserved54[2];          /* 0x0054 */
         __u16   ipa;                    /* 0x0056 */
@@ -226,10 +226,17 @@ struct kvm_vcpu_stat {
         u32 instruction_sigp_sense_running;
         u32 instruction_sigp_external_call;
         u32 instruction_sigp_emergency;
+        u32 instruction_sigp_cond_emergency;
+        u32 instruction_sigp_start;
         u32 instruction_sigp_stop;
+        u32 instruction_sigp_stop_store_status;
+        u32 instruction_sigp_store_status;
         u32 instruction_sigp_arch;
         u32 instruction_sigp_prefix;
         u32 instruction_sigp_restart;
+        u32 instruction_sigp_init_cpu_reset;
+        u32 instruction_sigp_cpu_reset;
+        u32 instruction_sigp_unknown;
         u32 diagnose_10;
         u32 diagnose_44;
         u32 diagnose_9c;
@@ -288,6 +295,79 @@ struct kvm_vcpu_stat {
 #define PGM_PER                         0x80
 #define PGM_CRYPTO_OPERATION            0x119
 
+/* irq types in order of priority */
+enum irq_types {
+        IRQ_PEND_MCHK_EX = 0,
+        IRQ_PEND_SVC,
+        IRQ_PEND_PROG,
+        IRQ_PEND_MCHK_REP,
+        IRQ_PEND_EXT_IRQ_KEY,
+        IRQ_PEND_EXT_MALFUNC,
+        IRQ_PEND_EXT_EMERGENCY,
+        IRQ_PEND_EXT_EXTERNAL,
+        IRQ_PEND_EXT_CLOCK_COMP,
+        IRQ_PEND_EXT_CPU_TIMER,
+        IRQ_PEND_EXT_TIMING,
+        IRQ_PEND_EXT_SERVICE,
+        IRQ_PEND_EXT_HOST,
+        IRQ_PEND_PFAULT_INIT,
+        IRQ_PEND_PFAULT_DONE,
+        IRQ_PEND_VIRTIO,
+        IRQ_PEND_IO_ISC_0,
+        IRQ_PEND_IO_ISC_1,
+        IRQ_PEND_IO_ISC_2,
+        IRQ_PEND_IO_ISC_3,
+        IRQ_PEND_IO_ISC_4,
+        IRQ_PEND_IO_ISC_5,
+        IRQ_PEND_IO_ISC_6,
+        IRQ_PEND_IO_ISC_7,
+        IRQ_PEND_SIGP_STOP,
+        IRQ_PEND_RESTART,
+        IRQ_PEND_SET_PREFIX,
+        IRQ_PEND_COUNT
+};
+
+/*
+ * Repressible (non-floating) machine check interrupts
+ * subclass bits in MCIC
+ */
+#define MCHK_EXTD_BIT 58
+#define MCHK_DEGR_BIT 56
+#define MCHK_WARN_BIT 55
+#define MCHK_REP_MASK ((1UL << MCHK_DEGR_BIT) | \
+                       (1UL << MCHK_EXTD_BIT) | \
+                       (1UL << MCHK_WARN_BIT))
+
+/* Exigent machine check interrupts subclass bits in MCIC */
+#define MCHK_SD_BIT 63
+#define MCHK_PD_BIT 62
+#define MCHK_EX_MASK ((1UL << MCHK_SD_BIT) | (1UL << MCHK_PD_BIT))
+
+#define IRQ_PEND_EXT_MASK ((1UL << IRQ_PEND_EXT_IRQ_KEY)    | \
+                           (1UL << IRQ_PEND_EXT_CLOCK_COMP) | \
+                           (1UL << IRQ_PEND_EXT_CPU_TIMER)  | \
+                           (1UL << IRQ_PEND_EXT_MALFUNC)    | \
+                           (1UL << IRQ_PEND_EXT_EMERGENCY)  | \
+                           (1UL << IRQ_PEND_EXT_EXTERNAL)   | \
+                           (1UL << IRQ_PEND_EXT_TIMING)     | \
+                           (1UL << IRQ_PEND_EXT_HOST)       | \
+                           (1UL << IRQ_PEND_EXT_SERVICE)    | \
+                           (1UL << IRQ_PEND_VIRTIO)         | \
+                           (1UL << IRQ_PEND_PFAULT_INIT)    | \
+                           (1UL << IRQ_PEND_PFAULT_DONE))
+
+#define IRQ_PEND_IO_MASK ((1UL << IRQ_PEND_IO_ISC_0) | \
+                          (1UL << IRQ_PEND_IO_ISC_1) | \
+                          (1UL << IRQ_PEND_IO_ISC_2) | \
+                          (1UL << IRQ_PEND_IO_ISC_3) | \
+                          (1UL << IRQ_PEND_IO_ISC_4) | \
+                          (1UL << IRQ_PEND_IO_ISC_5) | \
+                          (1UL << IRQ_PEND_IO_ISC_6) | \
+                          (1UL << IRQ_PEND_IO_ISC_7))
+
+#define IRQ_PEND_MCHK_MASK ((1UL << IRQ_PEND_MCHK_REP) | \
+                            (1UL << IRQ_PEND_MCHK_EX))
+
 struct kvm_s390_interrupt_info {
         struct list_head list;
         u64     type;
@@ -306,14 +386,25 @@ struct kvm_s390_interrupt_info {
 #define ACTION_STORE_ON_STOP            (1<<0)
 #define ACTION_STOP_ON_STOP             (1<<1)
 
+struct kvm_s390_irq_payload {
+        struct kvm_s390_io_info io;
+        struct kvm_s390_ext_info ext;
+        struct kvm_s390_pgm_info pgm;
+        struct kvm_s390_emerg_info emerg;
+        struct kvm_s390_extcall_info extcall;
+        struct kvm_s390_prefix_info prefix;
+        struct kvm_s390_mchk_info mchk;
+};
+
 struct kvm_s390_local_interrupt {
         spinlock_t lock;
-        struct list_head list;
-        atomic_t active;
         struct kvm_s390_float_interrupt *float_int;
         wait_queue_head_t *wq;
         atomic_t *cpuflags;
         unsigned int action_bits;
+        DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS);
+        struct kvm_s390_irq_payload irq;
+        unsigned long pending_irqs;
 };
 
 struct kvm_s390_float_interrupt {
@@ -434,6 +525,8 @@ struct kvm_arch{
         int user_cpu_state_ctrl;
         struct s390_io_adapter *adapters[MAX_S390_IO_ADAPTERS];
         wait_queue_head_t ipte_wq;
+        int ipte_lock_count;
+        struct mutex ipte_mutex;
         spinlock_t start_stop_lock;
         struct kvm_s390_crypto crypto;
 };
diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
index e510b9460efa..3009c2ba46d2 100644
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
@@ -24,6 +24,7 @@ void page_table_free_rcu(struct mmu_gather *, unsigned long *, unsigned long);
 
 int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
                           unsigned long key, bool nq);
+unsigned long get_guest_storage_key(struct mm_struct *mm, unsigned long addr);
 
 static inline void clear_table(unsigned long *s, unsigned long val, size_t n)