KVM: s390: add vcpu stat counters for many instruction

The overall instruction counter is larger than the sum of the
single counters. We should try to catch all instruction handlers
to make this match the summary counter.
Let us add sck,tb,sske,iske,rrbe,tb,tpi,tsch,lpsw,pswe....
and remove other unused ones.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>

1 files changed, 17 insertions, 4 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index e16a9f2a44ad..029e8144c6ec 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -2,7 +2,7 @@
 /*
  * definition for kernel virtual machines on s390
  *
- * Copyright IBM Corp. 2008, 2009
+ * Copyright IBM Corp. 2008, 2018
  *
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
  */
@@ -316,18 +316,30 @@ struct kvm_vcpu_stat {
         u64 deliver_program_int;
         u64 deliver_io_int;
         u64 exit_wait_state;
+        u64 instruction_epsw;
+        u64 instruction_gs;
+        u64 instruction_io_other;
+        u64 instruction_lpsw;
+        u64 instruction_lpswe;
         u64 instruction_pfmf;
+        u64 instruction_ptff;
+        u64 instruction_sck;
+        u64 instruction_sckpf;
         u64 instruction_stidp;
         u64 instruction_spx;
         u64 instruction_stpx;
         u64 instruction_stap;
-        u64 instruction_storage_key;
+        u64 instruction_iske;
+        u64 instruction_ri;
+        u64 instruction_rrbe;
+        u64 instruction_sske;
         u64 instruction_ipte_interlock;
-        u64 instruction_stsch;
-        u64 instruction_chsc;
         u64 instruction_stsi;
         u64 instruction_stfl;
+        u64 instruction_tb;
+        u64 instruction_tpi;
         u64 instruction_tprot;
+        u64 instruction_tsch;
         u64 instruction_sie;
         u64 instruction_essa;
         u64 instruction_sthyi;
@@ -353,6 +365,7 @@ struct kvm_vcpu_stat {
         u64 diagnose_258;
         u64 diagnose_308;
         u64 diagnose_500;
+        u64 diagnose_other;
 };
 
 #define PGM_OPERATION                   0x01