KVM: arm/arm64: Count guest exit due to various reasons
Subsystems (3)
PATCH v2 1/1 KVM: arm/arm64: Count guest exit due to various reasons
From: Amit Tomar <[email protected]>
It would add guest exit statistics to debugfs, This can be helpful while measuring KVM performance.
---
Changes since v1:
* Defined equal number of stats for ARM and ARM64
* Differentiated MMIO_EXIT handled between Userspace and Kernel
* Distinguished between wfi and wfe stat counters
--- arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm/kvm/arm.c | 1 + arch/arm/kvm/guest.c | 6 ++++++ arch/arm/kvm/handle_exit.c | 3 +++ arch/arm/kvm/mmio.c | 3 +++ arch/arm64/include/asm/kvm_host.h | 6 ++++++ arch/arm64/kvm/guest.c | 9 +++++++++ arch/arm64/kvm/handle_exit.c | 3 +++ 8 files changed, 37 insertions(+)
arch/arm/include/asm/kvm_host.h +6 -0
@@ -150,6 +150,12 @@ struct kvm_vcpu_stat {u32 halt_successful_poll;u32 halt_attempted_poll;u32 halt_wakeup; +u32 hvc_exit_stat; +u64 wfe_exit_stat; +u64 wfi_exit_stat; +u64 mmio_exit_handled_in_userspace_stat; +u64 mmio_exit_handled_in_kernel_stat; +u64 exits; };int kvm_vcpu_preferred_target (struct kvm_vcpu_init *init);
arch/arm/kvm/arm.c +1 -0
@@ -603,6 +603,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) ret =kvm_call_hyp (__kvm_vcpu_run, vcpu); vcpu->mode =OUTSIDE_GUEST_MODE ; + vcpu->stat.exits++;/* * Back from guest *************************************************************/
arch/arm/kvm/guest.c +6 -0
@@ -33,6 +33,12 @@#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_handled_in_userspace_stat), +VCPU_STAT (mmio_exit_handled_in_kernel_stat), +VCPU_STAT (exits), {NULL } };
arch/arm/kvm/handle_exit.c +3 -0
@@ -42,6 +42,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)trace_kvm_hvc (*vcpu_pc (vcpu), *vcpu_reg (vcpu,0 ),kvm_vcpu_hvc_get_imm (vcpu)); + vcpu->stat.hvc_exit_stat++; ret =kvm_psci_call (vcpu);if (ret <0 ) {
@@ -89,9 +90,11 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) {if (kvm_vcpu_get_hsr (vcpu) &HSR_WFI_IS_WFE ) {trace_kvm_wfx (*vcpu_pc (vcpu), true); + vcpu->stat.wfe_exit_stat++;kvm_vcpu_on_spin (vcpu); }else {trace_kvm_wfx (*vcpu_pc (vcpu), false); + vcpu->stat.wfi_exit_stat++;kvm_vcpu_block (vcpu); }
arch/arm/kvm/mmio.c +3 -0
@@ -209,8 +209,11 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,if (!ret) {/* We handled the access successfully in the kernel. */ + vcpu->stat.mmio_exit_handled_in_kernel_stat++;kvm_handle_mmio_return (vcpu, run);return 1 ; + }else { + vcpu->stat.mmio_exit_handled_in_userspace_stat++; } run->exit_reason =KVM_EXIT_MMIO ;
arch/arm64/include/asm/kvm_host.h +6 -0
@@ -197,6 +197,12 @@ struct kvm_vcpu_stat {u32 halt_successful_poll;u32 halt_attempted_poll;u32 halt_wakeup; +u32 hvc_exit_stat; +u64 wfe_exit_stat; +u64 wfi_exit_stat; +u64 mmio_exit_handled_in_userspace_stat; +u64 mmio_exit_handled_in_kernel_stat; +u64 exits; };int kvm_vcpu_preferred_target (struct kvm_vcpu_init *init);
arch/arm64/kvm/guest.c +9 -0
@@ -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_handled_in_userspace_stat), +VCPU_STAT (mmio_exit_handled_in_kernel_stat), +VCPU_STAT (exits), {NULL } };
arch/arm64/kvm/handle_exit.c +3 -0
@@ -39,6 +39,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)trace_kvm_hvc_arm64 (*vcpu_pc (vcpu), *vcpu_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); }
Signature · 1 line
2.1.4
Quoted 27 lines · Amit Singh Tomar
From: Amit Tomar <[email protected]>
It would add guest exit statistics to debugfs, This can be helpful while measuring KVM performance.
Signed-off-by Amit Singh Tomar <[email protected]>---
Changes since v1:
* Defined equal number of stats for ARM and ARM64
* DifferentiatedMMIO_EXIThandled between Userspace and Kernel
* Distinguished between wfi and wfe stat counters--- arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm/kvm/arm.c | 1 + arch/arm/kvm/guest.c | 6 ++++++ arch/arm/kvm/handle_exit.c | 3 +++ arch/arm/kvm/mmio.c | 3 +++ arch/arm64/include/asm/kvm_host.h | 6 ++++++ arch/arm64/kvm/guest.c | 9 +++++++++ arch/arm64/kvm/handle_exit.c | 3 +++ 8 files changed, 37 insertions(+)arch/arm/include/asm/kvm_host.h +0
-0
arch/arm/include/asm/kvm_host.h struct kvm_vcpu_stat { · line 157
Quoted 8 lines
arch/arm/include/asm/kvm_host.h +5
-0@@ -150,6 +150,12 @@ struct kvm_vcpu_stat {u32 halt_successful_poll;u32 halt_attempted_poll;u32 halt_wakeup; +u32 hvc_exit_stat; +u64 wfe_exit_stat; +u64 wfi_exit_stat; +u64 mmio_exit_handled_in_userspace_stat; +u64 mmio_exit_handled_in_kernel_stat;
eh, I think these should just be called mmio_exit_user and mmio_exit_kernel
Quoted 78 lines
arch/arm/include/asm/kvm_host.h +1
-0+u64 exits; };int kvm_vcpu_preferred_target (struct kvm_vcpu_init *init);arch/arm/kvm/arm.c +1
-0@@ -603,6 +603,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) ret =kvm_call_hyp (__kvm_vcpu_run, vcpu); vcpu->mode =OUTSIDE_GUEST_MODE ; + vcpu->stat.exits++;/* * Back from guest *************************************************************/ arch/arm/kvm/guest.c +6
-0@@ -33,6 +33,12 @@#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_handled_in_userspace_stat), +VCPU_STAT (mmio_exit_handled_in_kernel_stat), +VCPU_STAT (exits), {NULL } };arch/arm/kvm/handle_exit.c +3
-0@@ -42,6 +42,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)trace_kvm_hvc (*vcpu_pc (vcpu), *vcpu_reg (vcpu,0 ),kvm_vcpu_hvc_get_imm (vcpu)); + vcpu->stat.hvc_exit_stat++; ret =kvm_psci_call (vcpu);if (ret <0 ) {@@ -89,9 +90,11 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) {if (kvm_vcpu_get_hsr (vcpu) &HSR_WFI_IS_WFE ) {trace_kvm_wfx (*vcpu_pc (vcpu), true); + vcpu->stat.wfe_exit_stat++;kvm_vcpu_on_spin (vcpu); }else {trace_kvm_wfx (*vcpu_pc (vcpu), false); + vcpu->stat.wfi_exit_stat++;kvm_vcpu_block (vcpu); }arch/arm/kvm/mmio.c +3
-0@@ -209,8 +209,11 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,if (!ret) {/* We handled the access successfully in the kernel. */ + vcpu->stat.mmio_exit_handled_in_kernel_stat++;kvm_handle_mmio_return (vcpu, run);return 1 ; + }else { + vcpu->stat.mmio_exit_handled_in_userspace_stat++; } run->exit_reason =KVM_EXIT_MMIO ;arch/arm64/include/asm/kvm_host.h +0
-0
arch/arm64/include/asm/kvm_host.h struct kvm_vcpu_stat { · line 204
Quoted 8 lines
arch/arm64/include/asm/kvm_host.h +5
-0@@ -197,6 +197,12 @@ struct kvm_vcpu_stat {u32 halt_successful_poll;u32 halt_attempted_poll;u32 halt_wakeup; +u32 hvc_exit_stat; +u64 wfe_exit_stat; +u64 wfi_exit_stat; +u64 mmio_exit_handled_in_userspace_stat; +u64 mmio_exit_handled_in_kernel_stat;
same problem with naming
Quoted 52 lines
arch/arm64/include/asm/kvm_host.h +1
-0+u64 exits; };int kvm_vcpu_preferred_target (struct kvm_vcpu_init *init);arch/arm64/kvm/guest.c +9
-0@@ -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_handled_in_userspace_stat), +VCPU_STAT (mmio_exit_handled_in_kernel_stat), +VCPU_STAT (exits), {NULL } };arch/arm64/kvm/handle_exit.c +3
-0@@ -39,6 +39,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)trace_kvm_hvc_arm64 (*vcpu_pc (vcpu), *vcpu_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); }Signature · 1 line
2.1.4
I've applied this patch to queue with the naming changed.
Thanks,
-Christoffer
Quoted 2 lines
I've applied this patch to queue with the naming changed.
Ok, Thanks!