Three different exit code ranges are named as low, high and vmgexit,
which start from 0x0, 0x400 and 0x80000000.
Original-by: Jim Mattson <jmattson@xxxxxxxxxx>
Signed-off-by: Jing Zhang <jingzhangos@xxxxxxxxxx>
---
arch/x86/include/asm/kvm_host.h | 7 +++++++
arch/x86/include/uapi/asm/svm.h | 7 +++++++
arch/x86/kvm/svm/svm.c | 21 +++++++++++++++++++++
arch/x86/kvm/x86.c | 9 +++++++++
4 files changed, 44 insertions(+)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index dd2380c9ea96..6e3c11a29afe 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -35,6 +35,7 @@
#include <asm/kvm_vcpu_regs.h>
#include <asm/hyperv-tlfs.h>
#include <asm/vmx.h>
+#include <asm/svm.h>
#define __KVM_HAVE_ARCH_VCPU_DEBUGFS
@@ -1261,6 +1262,12 @@ struct kvm_vcpu_stat {
u64 vmx_all_exits[EXIT_REASON_NUM];
u64 vmx_l2_exits[EXIT_REASON_NUM];
u64 vmx_nested_exits[EXIT_REASON_NUM];
+ u64 svm_exits_low[SVM_EXIT_LOW_END - SVM_EXIT_LOW_START];
+ u64 svm_exits_high[SVM_EXIT_HIGH_END - SVM_EXIT_HIGH_START];
+ u64 svm_vmgexits[SVM_VMGEXIT_END - SVM_VMGEXIT_START];
+ u64 svm_vmgexit_unsupported_event;
+ u64 svm_exit_sw;
+ u64 svm_exit_err;
};
struct x86_instruction_info;
diff --git a/arch/x86/include/uapi/asm/svm.h b/arch/x86/include/uapi/asm/svm.h
index efa969325ede..153ebc4ac70e 100644
--- a/arch/x86/include/uapi/asm/svm.h
+++ b/arch/x86/include/uapi/asm/svm.h
@@ -2,6 +2,7 @@
#ifndef _UAPI__SVM_H
#define _UAPI__SVM_H
+#define SVM_EXIT_LOW_START 0x000
#define SVM_EXIT_READ_CR0 0x000
#define SVM_EXIT_READ_CR2 0x002
#define SVM_EXIT_READ_CR3 0x003
@@ -95,17 +96,23 @@
#define SVM_EXIT_CR14_WRITE_TRAP 0x09e
#define SVM_EXIT_CR15_WRITE_TRAP 0x09f
#define SVM_EXIT_INVPCID 0x0a2
+#define SVM_EXIT_LOW_END 0xa3
+
+#define SVM_EXIT_HIGH_START 0x400
#define SVM_EXIT_NPF 0x400
#define SVM_EXIT_AVIC_INCOMPLETE_IPI 0x401
#define SVM_EXIT_AVIC_UNACCELERATED_ACCESS 0x402
#define SVM_EXIT_VMGEXIT 0x403
+#define SVM_EXIT_HIGH_END 0x404
/* SEV-ES software-defined VMGEXIT events */
+#define SVM_VMGEXIT_START 0x80000000
#define SVM_VMGEXIT_MMIO_READ 0x80000001
#define SVM_VMGEXIT_MMIO_WRITE 0x80000002
#define SVM_VMGEXIT_NMI_COMPLETE 0x80000003
#define SVM_VMGEXIT_AP_HLT_LOOP 0x80000004
#define SVM_VMGEXIT_AP_JUMP_TABLE 0x80000005
+#define SVM_VMGEXIT_END 0x80000006
#define SVM_VMGEXIT_SET_AP_JUMP_TABLE 0
#define SVM_VMGEXIT_GET_AP_JUMP_TABLE 1
#define SVM_VMGEXIT_UNSUPPORTED_EVENT 0x8000ffff
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 1a70e11f0487..e04bd201dd53 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3291,6 +3291,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
struct vcpu_svm *svm = to_svm(vcpu);
struct kvm_run *kvm_run = vcpu->run;
u32 exit_code = svm->vmcb->control.exit_code;
+ size_t index;
trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);
@@ -3337,6 +3338,26 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
if (exit_fastpath != EXIT_FASTPATH_NONE)
return 1;
+ if (exit_code >= SVM_EXIT_LOW_START &&
+ exit_code < SVM_EXIT_LOW_END) {
+ index = exit_code - SVM_EXIT_LOW_START;
+ ++vcpu->stat.svm_exits_low[index];
+ } else if (exit_code >= SVM_EXIT_HIGH_START &&
+ exit_code < SVM_EXIT_HIGH_END) {
+ index = exit_code - SVM_EXIT_HIGH_START;
+ ++vcpu->stat.svm_exits_high[index];
+ } else if (exit_code >= SVM_VMGEXIT_START &&
+ exit_code < SVM_VMGEXIT_END) {
+ index = exit_code - SVM_VMGEXIT_START;
+ ++vcpu->stat.svm_vmgexits[index];
+ } else if (exit_code == SVM_VMGEXIT_UNSUPPORTED_EVENT) {
+ ++vcpu->stat.svm_vmgexit_unsupported_event;
+ } else if (exit_code == SVM_EXIT_SW) {
+ ++vcpu->stat.svm_exit_sw;
+ } else if (exit_code == SVM_EXIT_ERR) {
+ ++vcpu->stat.svm_exit_err;
+ }
+
return svm_invoke_exit_handler(vcpu, exit_code);
}
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 245ad1d147dd..df75e4b2711e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -281,6 +281,15 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {
STATS_DESC_LINHIST_COUNTER(VCPU, vmx_all_exits, EXIT_REASON_NUM, 1),
STATS_DESC_LINHIST_COUNTER(VCPU, vmx_l2_exits, EXIT_REASON_NUM, 1),
STATS_DESC_LINHIST_COUNTER(VCPU, vmx_nested_exits, EXIT_REASON_NUM, 1),
+ STATS_DESC_LINHIST_COUNTER(VCPU, svm_exits_low,
+ SVM_EXIT_LOW_END - SVM_EXIT_LOW_START, 1),
+ STATS_DESC_LINHIST_COUNTER(VCPU, svm_exits_high,
+ SVM_EXIT_HIGH_END - SVM_EXIT_HIGH_START, 1),
+ STATS_DESC_LINHIST_COUNTER(VCPU, svm_vmgexits,
+ SVM_VMGEXIT_END - SVM_VMGEXIT_START, 1),
+ STATS_DESC_COUNTER(VCPU, svm_vmgexit_unsupported_event),
+ STATS_DESC_COUNTER(VCPU, svm_exit_sw),
+ STATS_DESC_COUNTER(VCPU, svm_exit_err),
};
const struct kvm_stats_header kvm_vcpu_stats_header = {
--
2.33.0.259.gc128427fd7-goog
