The exit reason stats can be used for monitoring the VCPU status.
Signed-off-by: Jing Zhang <jingzhangos@xxxxxxxxxx>
---
arch/arm64/include/asm/kvm_host.h | 33 ++++++++++++++++++++++++++++---
arch/arm64/kvm/guest.c | 33 +++++++++++++++++++++++++++----
arch/arm64/kvm/handle_exit.c | 22 ++++++++++++++++++---
arch/arm64/kvm/mmu.c | 7 +++++--
arch/arm64/kvm/sys_regs.c | 6 ++++++
5 files changed, 89 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 0f0cea26ce32..4d65de22add3 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -607,13 +607,40 @@ struct kvm_vm_stat {
struct kvm_vcpu_stat {
struct kvm_vcpu_stat_generic generic;
- u64 hvc_exit_stat;
- u64 wfe_exit_stat;
- u64 wfi_exit_stat;
u64 mmio_exit_user;
u64 mmio_exit_kernel;
u64 signal_exits;
u64 exits;
+ /* Stats for arch specific exit reasons */
+ struct {
+ u64 exit_unknown;
+ u64 exit_irq;
+ u64 exit_el1_serror;
+ u64 exit_hyp_gone;
+ u64 exit_il;
+ u64 exit_wfi;
+ u64 exit_wfe;
+ u64 exit_cp15_32;
+ u64 exit_cp15_64;
+ u64 exit_cp14_32;
+ u64 exit_cp14_ls;
+ u64 exit_cp14_64;
+ u64 exit_hvc32;
+ u64 exit_smc32;
+ u64 exit_hvc64;
+ u64 exit_smc64;
+ u64 exit_sys64;
+ u64 exit_sve;
+ u64 exit_iabt_low;
+ u64 exit_dabt_low;
+ u64 exit_softstp_low;
+ u64 exit_watchpt_low;
+ u64 exit_breakpt_low;
+ u64 exit_bkpt32;
+ u64 exit_brk64;
+ u64 exit_fp_asimd;
+ u64 exit_pac;
+ };
};
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 5ce26bedf23c..abd9327d7110 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -43,13 +43,38 @@ const struct kvm_stats_header kvm_vm_stats_header = {
const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {
KVM_GENERIC_VCPU_STATS(),
- STATS_DESC_COUNTER(VCPU, hvc_exit_stat),
- STATS_DESC_COUNTER(VCPU, wfe_exit_stat),
- STATS_DESC_COUNTER(VCPU, wfi_exit_stat),
STATS_DESC_COUNTER(VCPU, mmio_exit_user),
STATS_DESC_COUNTER(VCPU, mmio_exit_kernel),
STATS_DESC_COUNTER(VCPU, signal_exits),
- STATS_DESC_COUNTER(VCPU, exits)
+ STATS_DESC_COUNTER(VCPU, exits),
+ /* Stats for arch specific exit reasons */
+ STATS_DESC_COUNTER(VCPU, exit_unknown),
+ STATS_DESC_COUNTER(VCPU, exit_irq),
+ STATS_DESC_COUNTER(VCPU, exit_el1_serror),
+ STATS_DESC_COUNTER(VCPU, exit_hyp_gone),
+ STATS_DESC_COUNTER(VCPU, exit_il),
+ STATS_DESC_COUNTER(VCPU, exit_wfi),
+ STATS_DESC_COUNTER(VCPU, exit_wfe),
+ STATS_DESC_COUNTER(VCPU, exit_cp15_32),
+ STATS_DESC_COUNTER(VCPU, exit_cp15_64),
+ STATS_DESC_COUNTER(VCPU, exit_cp14_32),
+ STATS_DESC_COUNTER(VCPU, exit_cp14_ls),
+ STATS_DESC_COUNTER(VCPU, exit_cp14_64),
+ STATS_DESC_COUNTER(VCPU, exit_hvc32),
+ STATS_DESC_COUNTER(VCPU, exit_smc32),
+ STATS_DESC_COUNTER(VCPU, exit_hvc64),
+ STATS_DESC_COUNTER(VCPU, exit_smc64),
+ STATS_DESC_COUNTER(VCPU, exit_sys64),
+ STATS_DESC_COUNTER(VCPU, exit_sve),
+ STATS_DESC_COUNTER(VCPU, exit_iabt_low),
+ STATS_DESC_COUNTER(VCPU, exit_dabt_low),
+ STATS_DESC_COUNTER(VCPU, exit_softstp_low),
+ STATS_DESC_COUNTER(VCPU, exit_watchpt_low),
+ STATS_DESC_COUNTER(VCPU, exit_breakpt_low),
+ STATS_DESC_COUNTER(VCPU, exit_bkpt32),
+ STATS_DESC_COUNTER(VCPU, exit_brk64),
+ STATS_DESC_COUNTER(VCPU, exit_fp_asimd),
+ STATS_DESC_COUNTER(VCPU, exit_pac),
};
const struct kvm_stats_header kvm_vcpu_stats_header = {
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 90a47758b23d..e83cd52078b2 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -38,7 +38,6 @@ static int handle_hvc(struct kvm_vcpu *vcpu)
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_hvc_call_handler(vcpu);
if (ret < 0) {
@@ -52,12 +51,14 @@ static int handle_hvc(struct kvm_vcpu *vcpu)
static int handle_hvc32(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_HVC32;
+ ++vcpu->stat.exit_hvc32;
return handle_hvc(vcpu);
}
static int handle_hvc64(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_HVC64;
+ ++vcpu->stat.exit_hvc64;
return handle_hvc(vcpu);
}
@@ -79,12 +80,14 @@ static int handle_smc(struct kvm_vcpu *vcpu)
static int handle_smc32(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_SMC32;
+ ++vcpu->stat.exit_smc32;
return handle_smc(vcpu);
}
static int handle_smc64(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_SMC64;
+ ++vcpu->stat.exit_smc64;
return handle_smc(vcpu);
}
@@ -95,6 +98,7 @@ static int handle_smc64(struct kvm_vcpu *vcpu)
static int handle_no_fpsimd(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_FP_ASIMD;
+ ++vcpu->stat.exit_fp_asimd;
kvm_inject_undefined(vcpu);
return 1;
}
@@ -115,13 +119,13 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu)
{
if (kvm_vcpu_get_esr(vcpu) & ESR_ELx_WFx_ISS_WFE) {
trace_kvm_wfx_arm64(*vcpu_pc(vcpu), true);
- vcpu->stat.wfe_exit_stat++;
vcpu->arch.exit_reason = ARM_EXIT_WFE;
+ ++vcpu->stat.exit_wfe;
kvm_vcpu_on_spin(vcpu, vcpu_mode_priv(vcpu));
} else {
trace_kvm_wfx_arm64(*vcpu_pc(vcpu), false);
- vcpu->stat.wfi_exit_stat++;
vcpu->arch.exit_reason = ARM_EXIT_WFI;
+ ++vcpu->stat.exit_wfi;
kvm_vcpu_block(vcpu);
kvm_clear_request(KVM_REQ_UNHALT, vcpu);
}
@@ -154,19 +158,24 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu)
switch (esr_ec) {
case ESR_ELx_EC_SOFTSTP_LOW:
vcpu->arch.exit_reason = ARM_EXIT_SOFTSTP_LOW;
+ ++vcpu->stat.exit_softstp_low;
break;
case ESR_ELx_EC_WATCHPT_LOW:
run->debug.arch.far = vcpu->arch.fault.far_el2;
vcpu->arch.exit_reason = ARM_EXIT_WATCHPT_LOW;
+ ++vcpu->stat.exit_watchpt_low;
break;
case ESR_ELx_EC_BREAKPT_LOW:
vcpu->arch.exit_reason = ARM_EXIT_BREAKPT_LOW;
+ ++vcpu->stat.exit_breakpt_low;
break;
case ESR_ELx_EC_BKPT32:
vcpu->arch.exit_reason = ARM_EXIT_BKPT32;
+ ++vcpu->stat.exit_bkpt32;
break;
case ESR_ELx_EC_BRK64:
vcpu->arch.exit_reason = ARM_EXIT_BRK64;
+ ++vcpu->stat.exit_brk64;
break;
}
@@ -181,6 +190,7 @@ static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu)
esr, esr_get_class_string(esr));
vcpu->arch.exit_reason = ARM_EXIT_UNKNOWN;
+ ++vcpu->stat.exit_unknown;
kvm_inject_undefined(vcpu);
return 1;
}
@@ -188,6 +198,7 @@ static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu)
static int handle_sve(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_SVE;
+ ++vcpu->stat.exit_sve;
/* Until SVE is supported for guests: */
kvm_inject_undefined(vcpu);
return 1;
@@ -201,6 +212,7 @@ static int handle_sve(struct kvm_vcpu *vcpu)
static int kvm_handle_ptrauth(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_PAC;
+ ++vcpu->stat.exit_pac;
kvm_inject_undefined(vcpu);
return 1;
}
@@ -278,9 +290,11 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index)
switch (exception_index) {
case ARM_EXCEPTION_IRQ:
vcpu->arch.exit_reason = ARM_EXIT_IRQ;
+ ++vcpu->stat.exit_irq;
return 1;
case ARM_EXCEPTION_EL1_SERROR:
vcpu->arch.exit_reason = ARM_EXIT_EL1_SERROR;
+ ++vcpu->stat.exit_el1_serror;
return 1;
case ARM_EXCEPTION_TRAP:
return handle_trap_exceptions(vcpu);
@@ -291,6 +305,7 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index)
*/
vcpu->arch.exit_reason = ARM_EXIT_HYP_GONE;
run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+ ++vcpu->stat.exit_hyp_gone;
return 0;
case ARM_EXCEPTION_IL:
/*
@@ -299,6 +314,7 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index)
*/
vcpu->arch.exit_reason = ARM_EXIT_IL;
run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+ ++vcpu->stat.exit_il;
return -EINVAL;
default:
kvm_pr_unimpl("Unsupported exception type: %d",
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index a6a18d113c98..799c756dd9f5 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1197,10 +1197,13 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu)
fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);
is_iabt = kvm_vcpu_trap_is_iabt(vcpu);
- if (is_iabt)
+ if (is_iabt) {
vcpu->arch.exit_reason = ARM_EXIT_IABT_LOW;
- else if (kvm_vcpu_trap_is_dabt(vcpu))
+ ++vcpu->stat.exit_iabt_low;
+ } else if (kvm_vcpu_trap_is_dabt(vcpu)) {
vcpu->arch.exit_reason = ARM_EXIT_DABT_LOW;
+ ++vcpu->stat.exit_dabt_low;
+ }
/* Synchronous External Abort? */
if (kvm_vcpu_abt_issea(vcpu)) {
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 0915dfa589c7..344a6ff26bf6 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -2159,6 +2159,7 @@ static int check_sysreg_table(const struct sys_reg_desc *table, unsigned int n,
int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_CP14_LS;
+ ++vcpu->stat.exit_cp14_ls;
kvm_inject_undefined(vcpu);
return 1;
}
@@ -2327,24 +2328,28 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu,
int kvm_handle_cp15_64(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_CP15_64;
+ ++vcpu->stat.exit_cp15_64;
return kvm_handle_cp_64(vcpu, cp15_64_regs, ARRAY_SIZE(cp15_64_regs));
}
int kvm_handle_cp15_32(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_CP15_32;
+ ++vcpu->stat.exit_cp15_32;
return kvm_handle_cp_32(vcpu, cp15_regs, ARRAY_SIZE(cp15_regs));
}
int kvm_handle_cp14_64(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_CP14_64;
+ ++vcpu->stat.exit_cp14_64;
return kvm_handle_cp_64(vcpu, cp14_64_regs, ARRAY_SIZE(cp14_64_regs));
}
int kvm_handle_cp14_32(struct kvm_vcpu *vcpu)
{
vcpu->arch.exit_reason = ARM_EXIT_CP14_32;
+ ++vcpu->stat.exit_cp14_32;
return kvm_handle_cp_32(vcpu, cp14_regs, ARRAY_SIZE(cp14_regs));
}
@@ -2403,6 +2408,7 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu)
trace_kvm_handle_sys_reg(esr);
vcpu->arch.exit_reason = ARM_EXIT_SYS64;
+ ++vcpu->stat.exit_sys64;
params = esr_sys64_to_params(esr);
params.regval = vcpu_get_reg(vcpu, Rt);
--
2.33.0.464.g1972c5931b-goog
