KVM: arm/arm64: Count guest exit due to various reasons

It would add guest exit statistics to debugfs, this can be helpful
while measuring KVM performance.

  [ Renamed some of the field names - Christoffer ]

Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

2 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index d250160d32bc..115522ba2461 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -34,7 +34,16 @@
 
 #include "trace.h"
 
+#define VM_STAT(x) { #x, offsetof(struct kvm, stat.x), KVM_STAT_VM }
+#define VCPU_STAT(x) { #x, offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU }
+
 struct kvm_stats_debugfs_item debugfs_entries[] = {
+        VCPU_STAT(hvc_exit_stat),
+        VCPU_STAT(wfe_exit_stat),
+        VCPU_STAT(wfi_exit_stat),
+        VCPU_STAT(mmio_exit_user),
+        VCPU_STAT(mmio_exit_kernel),
+        VCPU_STAT(exits),
         { NULL }
 };
 
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 15f0477b0d2a..8bddae140461 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -39,6 +39,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)
 
         trace_kvm_hvc_arm64(*vcpu_pc(vcpu), vcpu_get_reg(vcpu, 0),
                             kvm_vcpu_hvc_get_imm(vcpu));
+        vcpu->stat.hvc_exit_stat++;
 
         ret = kvm_psci_call(vcpu);
         if (ret < 0) {
@@ -71,9 +72,11 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
         if (kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WFx_ISS_WFE) {
                 trace_kvm_wfx_arm64(*vcpu_pc(vcpu), true);
+                vcpu->stat.wfe_exit_stat++;
                 kvm_vcpu_on_spin(vcpu);
         } else {
                 trace_kvm_wfx_arm64(*vcpu_pc(vcpu), false);
+                vcpu->stat.wfi_exit_stat++;
                 kvm_vcpu_block(vcpu);
         }