Changeset 14543 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2008 7:36:37 PM (16 years ago)

Author:

vboxsync

Message:

#1865/VT-x: Attacking the heap allocation, introducing VMMIsHwVirtExtForced which will only return true on darwin (for now at least).

Location:

trunk/src/VBox

Files:

• Main/ConsoleImpl2.cpp (modified) (1 diff)
• VMM/MMHyper.cpp (modified) (1 diff)
• VMM/VM.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -205 +205 @@
     else
         fHWVirtExEnabled = (hwVirtExEnabled == TSBool_True);
-#ifndef RT_OS_DARWIN /** @todo Implement HWVirtExt on darwin. See #1865. */
+#ifdef RT_OS_DARWIN
+    rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      fHWVirtExEnabled);      RC_CHECK();
+#else
+    rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      0);                     RC_CHECK();
+#endif
     if (fHWVirtExEnabled)
     {
         PCFGMNODE pHWVirtExt;
         rc = CFGMR3InsertNode(pRoot, "HWVirtExt", &pHWVirtExt);                     RC_CHECK();
-        rc = CFGMR3InsertInteger(pHWVirtExt, "Enabled", 1);                         RC_CHECK();
-    }
-#endif
+        rc = CFGMR3InsertInteger(pHWVirtExt, "Enabled",     1);                     RC_CHECK();
+    }
 
     /* Nested paging (VT-x/AMD-V) */

trunk/src/VBox/VMM/MMHyper.cpp

@@ -781 +781 @@
      * Allocate the hypervisor heap.
      */
-    const uint32_t cbAligned = RT_ALIGN_32(cb, PAGE_SIZE);
+    const uint32_t  cbAligned = RT_ALIGN_32(cb, PAGE_SIZE);
     AssertReturn(cbAligned >= cb, VERR_INVALID_PARAMETER);
-    void *pv;
-    int rc = SUPPageAlloc(cbAligned >> PAGE_SHIFT, &pv); /** @todo #1865: heap allocation must be changed for osx (only). */
+    int             rc;
+    void           *pv;
+    RTR0PTR         pvR0;
+#if 1
+    rc = SUPPageAlloc(cbAligned >> PAGE_SHIFT, &pv); /** @todo #1865: heap allocation must be changed for osx (only). */
+    pvR0 = (uintptr_t)pv;
+#else /**@todo resume here. */
+    if (VMMIsHwVirtExtForced(pVM))
+        rc = SUPPageAllocKernel((cbAligned >> PAGE_SHIFT, &pv, &pvR0, paPages);
+    else
+    {
+        rc = SUPPageAllocLocked((cbAligned >> PAGE_SHIFT, &pv, paPages);
+        pvR0 = (uintptr_t)pv;
+    }
+#endif
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/VM.cpp

@@ -526 +526 @@
         if (RT_SUCCESS(rc))
         {
+            rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "fHwVirtExtForced", &pVM->fHwVirtExtForced, false);
+            if (RT_SUCCESS(rc) && pVM->fHwVirtExtForced)
+                pVM->fHWACCMEnabled = true;
+
             /*
              * If executing in fake suplib mode disable RR3 and RR0 in the config.
@@ -541 +545 @@
              * Make sure the CPU count in the config data matches.
              */
-            uint32_t cCPUsCfg;
-            rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &cCPUsCfg, 1);
-            AssertLogRelMsgRC(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Rrc\n", rc));
-            if (RT_SUCCESS(rc) && cCPUsCfg != cCPUs)
+            if (RT_SUCCESS(rc))
             {
-                AssertLogRelMsgFailed(("Configuration error: \"NumCPUs\"=%RU32 and VMR3CreateVM::cCPUs=%RU32 does not match!\n",
-                                       cCPUsCfg, cCPUs));
-                rc = VERR_INVALID_PARAMETER;
+                uint32_t cCPUsCfg;
+                rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &cCPUsCfg, 1);
+                AssertLogRelMsgRC(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Rrc\n", rc));
+                if (RT_SUCCESS(rc) && cCPUsCfg != cCPUs)
+                {
+                    AssertLogRelMsgFailed(("Configuration error: \"NumCPUs\"=%RU32 and VMR3CreateVM::cCPUs=%RU32 does not match!\n",
+                                           cCPUsCfg, cCPUs));
+                    rc = VERR_INVALID_PARAMETER;
+                }
             }
             if (RT_SUCCESS(rc))