Changeset 87530 in vbox for trunk/src

Timestamp:

Feb 2, 2021 11:27:43 AM (4 years ago)

Author:

vboxsync

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

142556

Message:

VMM/HMVMX: Moving more stuff to HMR0PERVM. Set freed memory handles/pointers to NIL/NULL. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (4 diffs)
• include/HMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -1845 +1845 @@
  * Frees pages allocated using hmR0VmxPagesAllocZ.
  *
- * @param   hMemObj     The ring-0 memory object associated with the allocation.
- */
-DECL_FORCE_INLINE(void) hmR0VmxPagesFree(RTR0MEMOBJ hMemObj)
+ * @param   phMemObj    Pointer to the memory object handle.  Will be set to
+ *                      NIL.
+ */
+DECL_FORCE_INLINE(void) hmR0VmxPagesFree(PRTR0MEMOBJ phMemObj)
 {
     /* We can cleanup wholesale since it's all one allocation. */
-    RTR0MemObjFree(hMemObj, true /* fFreeMappings */);
+    if (*phMemObj != NIL_RTR0MEMOBJ)
+    {
+        RTR0MemObjFree(*phMemObj, true /* fFreeMappings */);
+        *phMemObj = NIL_RTR0MEMOBJ;
+    }
 }
 
@@ -1889 +1894 @@
 static void hmR0VmxVmcsInfoFree(PVMXVMCSINFO pVmcsInfo, PVMXVMCSINFOSHARED pVmcsInfoShared)
 {
-    if (pVmcsInfo->hMemObj != NIL_RTR0MEMOBJ)
-    {
-        hmR0VmxPagesFree(pVmcsInfo->hMemObj);
-        hmR0VmxVmcsInfoInit(pVmcsInfo, pVmcsInfoShared);
-    }
+    hmR0VmxPagesFree(&pVmcsInfo->hMemObj);
+    hmR0VmxVmcsInfoInit(pVmcsInfo, pVmcsInfoShared);
 }
 
@@ -1974 +1976 @@
 static void hmR0VmxStructsFree(PVMCC pVM)
 {
-    hmR0VmxPagesFree(pVM->hm.s.vmx.hMemObj);
+    hmR0VmxPagesFree(&pVM->hmr0.s.vmx.hMemObj);
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     if (pVM->hm.s.vmx.fUseVmcsShadowing)
     {
         RTMemFree(pVM->hm.s.vmx.paShadowVmcsFields);
+        pVM->hm.s.vmx.paShadowVmcsFields = NULL;
         RTMemFree(pVM->hm.s.vmx.paShadowVmcsRoFields);
+        pVM->hm.s.vmx.paShadowVmcsRoFields = NULL;
     }
 #endif
@@ -2035 +2039 @@
     };
 
-    int rc = hmR0VmxPagesAllocZ(&pVM->hm.s.vmx.hMemObj, &aAllocInfo[0], RT_ELEMENTS(aAllocInfo));
+    int rc = hmR0VmxPagesAllocZ(&pVM->hmr0.s.vmx.hMemObj, &aAllocInfo[0], RT_ELEMENTS(aAllocInfo));
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/include/HMInternal.h

@@ -589 +589 @@
          *  mode without paging emulation in EPT mode. */
         R3PTRTYPE(PX86PD)           pNonPagingModeEPTPageTable;
-
-        /** Ring-0 memory object for per-VM VMX structures. */
-        RTR0MEMOBJ                  hMemObj;
     } vmx;
 
@@ -679 +676 @@
     uint32_t                    fHostKernelFeatures;
 
-    /** SVM specific data. */
+    /** VT-x specific data. */
+    struct HMR0VMXVM
+    {
+        /** Ring-0 memory object for per-VM VMX structures. */
+        RTR0MEMOBJ                  hMemObj;
+
+    } vmx;
+
+    /** AMD-V specific data. */
     struct HMR0SVMVM
     {