Changeset 73983 in vbox for trunk/include/VBox/vmm

Timestamp:

Aug 31, 2018 8:17:31 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM, HM: Nested VMX: bugref:9180 Implement VMREAD, added using decoded IEM APIs for
VMXON, VMREAD, VMWRITE in VMX R0 code.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (4 diffs)
• iem.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -972 +972 @@
         /** The address size; 0=16-bit, 1=32-bit, 2=64-bit, rest undefined. */
         uint32_t    u3AddrSize      : 3;
-        /** Memory/Register - Always cleared to 0 to indicate memory operand. */
+        /** Memory or register operand. */
         uint32_t    fIsRegOperand   : 1;
         /** Operand size; 0=16-bit, 1=32-bit, 2=64-bit, 3=unused.  */
@@ -2313 +2313 @@
 #define VMX_INSTR_ID_IS_VALID(a)                              (((a) >> 7) & 1)
 #define VMX_INSTR_ID_GET_ID(a)                                ((a) & ~VMX_INSTR_ID_VALID)
-#define VMX_INSTR_ID_NONE                                     0x7f
-/** The following values are in accordance to the VT-x spec: */
+/** The OR'd rvalues are from the VT-x spec (valid bit is VBox specific): */
 #define VMX_INSTR_ID_SGDT                                     ((VMX_INSTR_ID_VALID) | 0)
 #define VMX_INSTR_ID_SIDT                                     ((VMX_INSTR_ID_VALID) | 1)
@@ -2881 +2880 @@
     kVmxVInstrDiag_Vmwrite_Success,
     /* Last member for determining array index limit. */
+    /* VMREAD. */
+    kVmxVInstrDiag_Vmread_Cpl,
+    kVmxVInstrDiag_Vmread_FieldInvalid,
+    kVmxVInstrDiag_Vmread_LinkPtrInvalid,
+    kVmxVInstrDiag_Vmread_PtrInvalid,
+    kVmxVInstrDiag_Vmread_PtrMap,
+    kVmxVInstrDiag_Vmread_Success,
     kVmxVInstrDiag_Last
 } VMXVINSTRDIAG;
@@ -2901 +2907 @@
 typedef struct
 {
+    /** The VM-exit reason. */
+    uint32_t                uReason;
+    /** The VM-exit instruction length. */
+    uint32_t                cbInstr;
+    /** The VM-exit instruction information. */
+    VMXEXITINSTRINFO        InstrInfo;
+    /** Padding. */
+    uint32_t                u32Padding0;
+
     /** The VM-exit qualification field. */
-    uint64_t                u64ExitQual;
+    uint64_t                u64Qual;
     /** The guest-linear address field. */
     uint64_t                u64GuestLinearAddr;
-    /** The VM-exit instruction information. */
-    VMXEXITINSTRINFO        ExitInstrInfo;
-    /** Padding. */
-    uint32_t                u32Padding0;
+    /** The effective guest-linear address if @a InstrInfo indicates a memory-based
+     *  instruction VM-exit. */
+    RTGCPTR                 GCPtrEffAddr;
+
+    /** The VM-exit instruction ID. */
+    VMXINSTRID              uInstrId;
 } VMXVEXITINFO;
 /** Pointer to the VMXVEXITINFO struct. */

trunk/include/VBox/vmm/iem.h

@@ -323 +323 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmwrite(PVMCPU pVCpu, uint8_t cbInstr, uint64_t u64Val, uint32_t uFieldEnc,
-                                                  PCVMXVEXITINFO pExitInfo);
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmptrld(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iEffSeg, RTGCPHYS GCPtrVmcs,
-                                                  PCVMXVEXITINFO pExitInfo);
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmptrst(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iEffSeg, RTGCPHYS GCPtrVmcs,
-                                                  PCVMXVEXITINFO pExitInfo);
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmclear(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iEffSeg, RTGCPHYS GCPtrVmcs,
-                                                  PCVMXVEXITINFO pExitInfo);
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmxon(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iEffSeg, RTGCPHYS GCPtrVmxon,
-                                                PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmwrite(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmptrld(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmptrst(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmclear(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmxon(PVMCPU pVCpu, PCVMXVEXITINFO pExitInfo);
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmxoff(PVMCPU pVCpu, uint8_t cbInstr);
 #endif