From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/31] KVM: arm/arm64: Count guest exit due to various reasons
Date: Thu, 24 Dec 2015 11:12:10 +0000 [thread overview]
Message-ID: <1450955559-15639-3-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1450955559-15639-1-git-send-email-marc.zyngier@arm.com>
From: Amit Tomar <amittomer25@gmail.com>
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>
---
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(+)
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index 6692982..f9f2779 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -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_user;
+ u64 mmio_exit_kernel;
+ u64 exits;
};
int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index e06fd29..8a79a57 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -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
*************************************************************/
diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
index 96e935b..5fa69d7 100644
--- a/arch/arm/kvm/guest.c
+++ b/arch/arm/kvm/guest.c
@@ -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_user),
+ VCPU_STAT(mmio_exit_kernel),
+ VCPU_STAT(exits),
{ NULL }
};
diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
index 95f12b2..3ede90d 100644
--- a/arch/arm/kvm/handle_exit.c
+++ b/arch/arm/kvm/handle_exit.c
@@ -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);
}
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 3a10c9f..7f33b20 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -210,8 +210,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_kernel++;
kvm_handle_mmio_return(vcpu, run);
return 1;
+ } else {
+ vcpu->stat.mmio_exit_user++;
}
run->exit_reason = KVM_EXIT_MMIO;
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index a35ce72..19504aa 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -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_user;
+ u64 mmio_exit_kernel;
+ u64 exits;
};
int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index d250160..115522b 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 15f0477..8bddae1 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);
}
--
2.1.4
next prev parent reply other threads:[~2015-12-24 11:12 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-24 11:12 [PULL] KVM/ARM updates for 4.5 Marc Zyngier
2015-12-24 11:12 ` [PATCH 01/31] KVM: arm/arm64: vgic: make vgic_io_ops static Marc Zyngier
2015-12-24 11:12 ` Marc Zyngier [this message]
2015-12-24 11:12 ` [PATCH 03/31] arm64: Add macros to read/write system registers Marc Zyngier
2015-12-24 11:12 ` [PATCH 04/31] arm64: KVM: Add a HYP-specific header file Marc Zyngier
2015-12-24 11:12 ` [PATCH 05/31] arm64: KVM: Implement vgic-v2 save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 06/31] KVM: arm/arm64: vgic-v3: Make the LR indexing macro public Marc Zyngier
2015-12-24 11:12 ` [PATCH 07/31] arm64: KVM: Implement vgic-v3 save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 08/31] arm64: KVM: Implement timer save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 09/31] arm64: KVM: Implement system register save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 10/31] arm64: KVM: Implement 32bit " Marc Zyngier
2015-12-24 11:12 ` [PATCH 11/31] arm64: KVM: Implement debug save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 12/31] arm64: KVM: Implement guest entry Marc Zyngier
2015-12-24 11:12 ` [PATCH 13/31] arm64: KVM: Add patchable function selector Marc Zyngier
2015-12-24 11:12 ` [PATCH 14/31] arm64: KVM: Implement the core world switch Marc Zyngier
2015-12-24 11:12 ` [PATCH 15/31] arm64: KVM: Implement fpsimd save/restore Marc Zyngier
2015-12-24 11:12 ` [PATCH 16/31] arm64: KVM: Implement TLB handling Marc Zyngier
2015-12-24 11:12 ` [PATCH 17/31] arm64: KVM: HYP mode entry points Marc Zyngier
2015-12-24 11:12 ` [PATCH 18/31] arm64: KVM: Add panic handling Marc Zyngier
2015-12-24 11:12 ` [PATCH 19/31] arm64: KVM: Add compatibility aliases Marc Zyngier
2015-12-24 11:12 ` [PATCH 20/31] arm64: KVM: Map the kernel RO section into HYP Marc Zyngier
2015-12-24 11:12 ` [PATCH 21/31] arm64: KVM: Move away from the assembly version of the world switch Marc Zyngier
2015-12-24 11:12 ` [PATCH 22/31] arm64: KVM: Turn system register numbers to an enum Marc Zyngier
2015-12-24 11:12 ` [PATCH 23/31] arm64: KVM: Cleanup asm-offset.c Marc Zyngier
2015-12-24 11:12 ` [PATCH 24/31] arm64: KVM: Remove weak attributes Marc Zyngier
2015-12-24 11:12 ` [PATCH 25/31] ARM: KVM: Cleanup exception injection Marc Zyngier
2015-12-24 11:12 ` [PATCH 26/31] arm64: KVM: debug: Remove spurious inline attributes Marc Zyngier
2015-12-24 11:12 ` [PATCH 27/31] arm/arm64: KVM: Remove unreferenced S2_PGD_ORDER Marc Zyngier
2015-12-24 11:12 ` [PATCH 28/31] arm: KVM: Make kvm_arm.h friendly to assembly code Marc Zyngier
2015-12-24 11:12 ` [PATCH 29/31] arm64: KVM: Add support for 16-bit VMID Marc Zyngier
2015-12-24 11:12 ` [PATCH 30/31] MAINTAINERS: add git URL for KVM/ARM Marc Zyngier
2015-12-24 11:12 ` [PATCH 31/31] arm/arm64: KVM: Detect vGIC presence at runtime Marc Zyngier
2016-01-07 10:07 ` [PULL] KVM/ARM updates for 4.5 Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450955559-15639-3-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).