From: GanShun <ganshun@xxxxxxxxxx>
Added a check in test_vmptrld to verfiy that VMXERR_VMPTRLD_VMXON_POINTER
is returned instead of VMXERR_VMCLEAR_VMXON_POINTER.
Signed-off-by: GanShun <ganshun@xxxxxxxxxx>
Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx>
---
x86/vmx.c | 3 +++
x86/vmx.h | 31 +++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/x86/vmx.c b/x86/vmx.c
index 651807a76a1e..39a891da4635 100644
--- a/x86/vmx.c
+++ b/x86/vmx.c
@@ -899,9 +899,12 @@ static void test_vmptrld(void)
make_vmcs_current(tmp_root) == 1);
/* Pass VMXON region */
+ make_vmcs_current(vmcs);
tmp_root = (struct vmcs *)vmxon_region;
report("test vmptrld with vmxon region",
make_vmcs_current(tmp_root) == 1);
+ report("test vmptrld with vmxon region vm-instruction error",
+ vmcs_read(VMX_INST_ERROR) == VMXERR_VMPTRLD_VMXON_POINTER);
report("test vmptrld with valid vmcs region", make_vmcs_current(vmcs) == 0);
}
diff --git a/x86/vmx.h b/x86/vmx.h
index 290e6bd72b19..52ece1aa53c8 100644
--- a/x86/vmx.h
+++ b/x86/vmx.h
@@ -396,6 +396,37 @@ enum Intr_type {
#define INTR_INFO_INTR_TYPE_SHIFT 8
+/*
+ * VM-instruction error numbers
+ */
+enum vm_instruction_error_number {
+ VMXERR_VMCALL_IN_VMX_ROOT_OPERATION = 1,
+ VMXERR_VMCLEAR_INVALID_ADDRESS = 2,
+ VMXERR_VMCLEAR_VMXON_POINTER = 3,
+ VMXERR_VMLAUNCH_NONCLEAR_VMCS = 4,
+ VMXERR_VMRESUME_NONLAUNCHED_VMCS = 5,
+ VMXERR_VMRESUME_AFTER_VMXOFF = 6,
+ VMXERR_ENTRY_INVALID_CONTROL_FIELD = 7,
+ VMXERR_ENTRY_INVALID_HOST_STATE_FIELD = 8,
+ VMXERR_VMPTRLD_INVALID_ADDRESS = 9,
+ VMXERR_VMPTRLD_VMXON_POINTER = 10,
+ VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID = 11,
+ VMXERR_UNSUPPORTED_VMCS_COMPONENT = 12,
+ VMXERR_VMWRITE_READ_ONLY_VMCS_COMPONENT = 13,
+ VMXERR_VMXON_IN_VMX_ROOT_OPERATION = 15,
+ VMXERR_ENTRY_INVALID_EXECUTIVE_VMCS_POINTER = 16,
+ VMXERR_ENTRY_NONLAUNCHED_EXECUTIVE_VMCS = 17,
+ VMXERR_ENTRY_EXECUTIVE_VMCS_POINTER_NOT_VMXON_POINTER = 18,
+ VMXERR_VMCALL_NONCLEAR_VMCS = 19,
+ VMXERR_VMCALL_INVALID_VM_EXIT_CONTROL_FIELDS = 20,
+ VMXERR_VMCALL_INCORRECT_MSEG_REVISION_ID = 22,
+ VMXERR_VMXOFF_UNDER_DUAL_MONITOR_TREATMENT_OF_SMIS_AND_SMM = 23,
+ VMXERR_VMCALL_INVALID_SMM_MONITOR_FEATURES = 24,
+ VMXERR_ENTRY_INVALID_VM_EXECUTION_CONTROL_FIELDS_IN_EXECUTIVE_VMCS = 25,
+ VMXERR_ENTRY_EVENTS_BLOCKED_BY_MOV_SS = 26,
+ VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID = 28,
+};
+
#define SAVE_GPR \
"xchg %rax, regs\n\t" \
"xchg %rbx, regs+0x8\n\t" \
--
2.12.2.816.g2cccc81164-goog
