Merge tag 'kvm-s390-next-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: fixes and features

- more kvm stat counters
- virtio gpu plumbing. The 3 non-KVM/s390 patches have Acks from
  Bartlomiej Zolnierkiewicz, Heiko Carstens and Greg Kroah-Hartman
  but all belong together to make virtio-gpu work as a tty. So
  I carried them in the KVM/s390 tree.
- document some KVM_CAPs
- cpu-model only facilities
- cleanups

3 files changed, 27 insertions, 7 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index afb0f08b8021..81cdb6b55118 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -294,6 +294,7 @@ struct kvm_vcpu_stat {
         u64 exit_userspace;
         u64 exit_null;
         u64 exit_external_request;
+        u64 exit_io_request;
         u64 exit_external_interrupt;
         u64 exit_stop_request;
         u64 exit_validity;
@@ -310,16 +311,29 @@ struct kvm_vcpu_stat {
         u64 exit_program_interruption;
         u64 exit_instr_and_program;
         u64 exit_operation_exception;
+        u64 deliver_ckc;
+        u64 deliver_cputm;
         u64 deliver_external_call;
         u64 deliver_emergency_signal;
         u64 deliver_service_signal;
-        u64 deliver_virtio_interrupt;
+        u64 deliver_virtio;
         u64 deliver_stop_signal;
         u64 deliver_prefix_signal;
         u64 deliver_restart_signal;
-        u64 deliver_program_int;
-        u64 deliver_io_int;
+        u64 deliver_program;
+        u64 deliver_io;
+        u64 deliver_machine_check;
         u64 exit_wait_state;
+        u64 inject_ckc;
+        u64 inject_cputm;
+        u64 inject_external_call;
+        u64 inject_emergency_signal;
+        u64 inject_mchk;
+        u64 inject_pfault_init;
+        u64 inject_program;
+        u64 inject_restart;
+        u64 inject_set_prefix;
+        u64 inject_stop_signal;
         u64 instruction_epsw;
         u64 instruction_gs;
         u64 instruction_io_other;
@@ -644,7 +658,12 @@ struct kvm_vcpu_arch {
 };
 
 struct kvm_vm_stat {
-        ulong remote_tlb_flush;
+        u64 inject_io;
+        u64 inject_float_mchk;
+        u64 inject_pfault_done;
+        u64 inject_service_signal;
+        u64 inject_virtio;
+        u64 remote_tlb_flush;
 };
 
 struct kvm_arch_memory_slot {
@@ -792,6 +811,7 @@ struct kvm_arch{
         int css_support;
         int use_irqchip;
         int use_cmma;
+        int use_pfmfi;
         int user_cpu_state_ctrl;
         int user_sigp;
         int user_stsi;
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index db35c41a59d5..c639c95850e4 100644
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -22,8 +22,8 @@ typedef struct {
         unsigned int has_pgste:1;
         /* The mmu context uses storage keys. */
         unsigned int use_skey:1;
-        /* The mmu context uses CMMA. */
-        unsigned int use_cmma:1;
+        /* The mmu context uses CMM. */
+        unsigned int uses_cmm:1;
 } mm_context_t;
 
 #define INIT_MM_CONTEXT(name)                                              \
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 65154eaa3714..d3ebfa8f8a9f 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -31,7 +31,7 @@ static inline int init_new_context(struct task_struct *tsk,
                 (current->mm && current->mm->context.alloc_pgste);
         mm->context.has_pgste = 0;
         mm->context.use_skey = 0;
-        mm->context.use_cmma = 0;
+        mm->context.uses_cmm = 0;
 #endif
         switch (mm->context.asce_limit) {
         case _REGION2_SIZE: