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

Timestamp:

Feb 24, 2022 3:14:31 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150150

Message:

VMM: Nested VMX: bugref:10092 EPT VM-exit handling with HM ring-0 code.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (2 diffs)
• iem.h (modified) (1 diff)
• pgm.h (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1597 +1597 @@
 VMM_INT_DECL(bool)      CPUMIsGuestVmxEptPagingEnabled(PCVMCPUCC pVCpu);
 VMM_INT_DECL(bool)      CPUMIsGuestVmxEptPaePagingEnabled(PCVMCPUCC pVCpu);
+VMM_INT_DECL(uint64_t)  CPUMGetGuestVmxApicAccessPageAddr(PCVMCPUCC pVCpu);
 /** @} */
 
@@ -2335 +2336 @@
  * @param   pCtx    Current CPU context.
  */
-DECLINLINE(uint64_t) CPUMGetGuestVmxApicAccessPageAddr(PCCPUMCTX pCtx)
+DECLINLINE(uint64_t) CPUMGetGuestVmxApicAccessPageAddrEx(PCCPUMCTX pCtx)
 {
     Assert(CPUMIsGuestInVmxNonRootMode(pCtx));

trunk/include/VBox/vmm/iem.h

@@ -383 +383 @@
 # ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedInvept(PVMCPUCC pVCpu, PCVMXVEXITINFO pExitInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecVmxVmexitEptViolation(PVMCPUCC pVCpu, PCVMXVEXITINFO pExitInfo, PCVMXVEXITEVENTINFO pExitEventInfo);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecVmxVmexitEptMisconfig(PVMCPUCC pVCpu, RTGCPHYS GCPhysAddr, PCVMXVEXITEVENTINFO pExitEventInfo);
 # endif
 #endif

trunk/include/VBox/vmm/pgm.h

@@ -508 +508 @@
     RTGCPHYS        GCPhysNested;
 
-    /** The physical address that is the result of the walk (output).
-     * @remarks This is page aligned and only valid if fSucceeded is set. */
+    /** The physical address that is the result of the walk (output). */
     RTGCPHYS        GCPhys;
 
@@ -613 +612 @@
 VMMDECL(int)        PGMUpdateCR3(PVMCPUCC pVCpu, uint64_t cr3);
 VMMDECL(int)        PGMChangeMode(PVMCPUCC pVCpu, uint64_t cr0, uint64_t cr4, uint64_t efer, bool fForce);
-VMM_INT_DECL(int)   PGMHCChangeMode(PVMCC pVM, PVMCPUCC pVCpu, PGMMODE enmGuestMode);
+VMM_INT_DECL(int)   PGMHCChangeMode(PVMCC pVM, PVMCPUCC pVCpu, PGMMODE enmGuestMode, bool fForce);
 VMMDECL(void)       PGMCr0WpEnabled(PVMCPUCC pVCpu);
 VMMDECL(PGMMODE)    PGMGetGuestMode(PVMCPU pVCpu);
@@ -949 +948 @@
                                                       PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, uint32_t uErr);
 VMMR0_INT_DECL(int)  PGMR0PoolGrow(PGVM pGVM, VMCPUID idCpu);
+
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+VMMR0DECL(VBOXSTRICTRC) PGMR0NestedTrap0eHandlerNestedPaging(PGVMCPU pGVCpu, PGMMODE enmShwPagingMode, RTGCUINT uErr,
+                                                             PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysNested,
+                                                             bool fIsLinearAddrValid, RTGCPTR GCPtrNested, PPGMPTWALK pWalk);
+# endif
 /** @} */
 #endif /* IN_RING0 */