Changeset 27166 in vbox

Timestamp:

Mar 8, 2010 2:16:00 PM (15 years ago)

Author:

vboxsync

Message:

Added large page property.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -561 +561 @@
                         fHardwareVirtExclusive,
                         fNestedPaging,
+                        fLargePages,
                         fVPID,
                         fSyntheticCpu,

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -165 +165 @@
                  "                            [--hwvirtex on|off]\n"
                  "                            [--nestedpaging on|off]\n"
+                 "                            [--largepages on|off]\n"
                  "                            [--vtxvpid on|off]\n"
                  "                            [--cpuidset <leaf> <eax> <ebx> <ecx> <edx>]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -432 +432 @@
     else
         RTPrintf("Nested Paging:   %s\n", HWVirtExNestedPagingEnabled ? "on" : "off");
+
+    BOOL HWVirtExLargePagesEnabled;
+    machine->GetHWVirtExProperty(HWVirtExPropertyType_LargePages, &HWVirtExLargePagesEnabled);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("largepages=\"%s\"\n", HWVirtExLargePagesEnabled ? "on" : "off");
+    else
+        RTPrintf("Large Pages:   %s\n", HWVirtExLargePagesEnabled ? "on" : "off");
 
     BOOL HWVirtExVPIDEnabled;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -69 +69 @@
     MODIFYVM_HWVIRTEXEXCLUSIVE,
     MODIFYVM_NESTEDPAGING,
+    MODIFYVM_LARGEPAGES,
     MODIFYVM_VTXVPID,
     MODIFYVM_CPUS,
@@ -158 +159 @@
     { "--hwvirtexexcl",             MODIFYVM_HWVIRTEXEXCLUSIVE,         RTGETOPT_REQ_BOOL_ONOFF },
     { "--nestedpaging",             MODIFYVM_NESTEDPAGING,              RTGETOPT_REQ_BOOL_ONOFF },
+    { "--largepages",               MODIFYVM_LARGEPAGES,                RTGETOPT_REQ_BOOL_ONOFF },
     { "--vtxvpid",                  MODIFYVM_VTXVPID,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--cpuidset",                 MODIFYVM_SETCPUID,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX},
@@ -425 +427 @@
             }
 
+            case MODIFYVM_LARGEPAGES:
+            {
+                CHECK_ERROR(machine, SetHWVirtExProperty(HWVirtExPropertyType_LargePages, ValueUnion.f));
+                break;
+            }
+
             case MODIFYVM_VTXVPID:
             {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -481 +481 @@
     rc = CFGMR3InsertInteger(pHWVirtExt, "EnableNestedPaging", fEnableNestedPaging);     RC_CHECK();
 
+    /* Large pages; requires nested paging */
+    BOOL fEnableLargePages = false;
+    hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_LargePages, &fEnableLargePages);   H();
+    rc = CFGMR3InsertInteger(pHWVirtExt, "EnableLargePages", fEnableLargePages);     RC_CHECK();
+
     /* VPID (VT-x) */
     BOOL fEnableVPID = false;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -164 +164 @@
     mHWVirtExEnabled = true;
     mHWVirtExNestedPagingEnabled = true;
+#if HC_ARCH_BITS == 64
+    /* Default value decision pending. */
+    mHWVirtExLargePagesEnabled = false;
+#else
+    /* Not supported on 32 bits hosts. */
+    mHWVirtExLargePagesEnabled = false;
+#endif
     mHWVirtExVPIDEnabled = true;
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
@@ -1661 +1668 @@
     switch(property)
     {
-    case HWVirtExPropertyType_Enabled:
-        *aVal = mHWData->mHWVirtExEnabled;
-        break;
-
-    case HWVirtExPropertyType_Exclusive:
-        *aVal = mHWData->mHWVirtExExclusive;
-        break;
-
-    case HWVirtExPropertyType_VPID:
-        *aVal = mHWData->mHWVirtExVPIDEnabled;
-        break;
-
-    case HWVirtExPropertyType_NestedPaging:
-        *aVal = mHWData->mHWVirtExNestedPagingEnabled;
-        break;
-
-    default:
-        return E_INVALIDARG;
+        case HWVirtExPropertyType_Enabled:
+            *aVal = mHWData->mHWVirtExEnabled;
+            break;
+
+        case HWVirtExPropertyType_Exclusive:
+            *aVal = mHWData->mHWVirtExExclusive;
+            break;
+
+        case HWVirtExPropertyType_VPID:
+            *aVal = mHWData->mHWVirtExVPIDEnabled;
+            break;
+
+        case HWVirtExPropertyType_NestedPaging:
+            *aVal = mHWData->mHWVirtExNestedPagingEnabled;
+            break;
+
+        case HWVirtExPropertyType_LargePages:
+            *aVal = mHWData->mHWVirtExLargePagesEnabled;
+            break;
+
+        default:
+            return E_INVALIDARG;
     }
     return S_OK;
@@ -1699 +1710 @@
         case HWVirtExPropertyType_Enabled:
             pb = &mHWData->mHWVirtExEnabled;
-        break;
+            break;
 
         case HWVirtExPropertyType_Exclusive:
             pb = &mHWData->mHWVirtExExclusive;
-        break;
+            break;
 
         case HWVirtExPropertyType_VPID:
             pb = &mHWData->mHWVirtExVPIDEnabled;
-        break;
+            break;
 
         case HWVirtExPropertyType_NestedPaging:
             pb = &mHWData->mHWVirtExNestedPagingEnabled;
-        break;
+            break;
+
+        case HWVirtExPropertyType_LargePages:
+            pb = &mHWData->mHWVirtExLargePagesEnabled;
+            break;
 
         default:
@@ -6198 +6213 @@
         mHWData->mHWVirtExExclusive           = data.fHardwareVirtExclusive;
         mHWData->mHWVirtExNestedPagingEnabled = data.fNestedPaging;
+        mHWData->mHWVirtExLargePagesEnabled   = data.fLargePages;
         mHWData->mHWVirtExVPIDEnabled         = data.fVPID;
         mHWData->mPAEEnabled                  = data.fPAE;
@@ -7254 +7270 @@
         data.fHardwareVirtExclusive = !!mHWData->mHWVirtExExclusive;
         data.fNestedPaging          = !!mHWData->mHWVirtExNestedPagingEnabled;
+        data.fLargePages            = !!mHWData->mHWVirtExLargePagesEnabled;
         data.fVPID                  = !!mHWData->mHWVirtExVPIDEnabled;
         data.fPAE                   = !!mHWData->mPAEEnabled;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -866 +866 @@
       <desc>
         Whether Nested Paging is enabled. If this extension is not available, it will not be used.
+      </desc>
+    </const>
+    <const name="LargePages"          value="5">
+      <desc>
+        Whether large page allocation is enabled; requires nested paging and a 64 bits host.
       </desc>
     </const>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -275 +275 @@
         BOOL                 mHWVirtExExclusive;
         BOOL                 mHWVirtExNestedPagingEnabled;
+        BOOL                 mHWVirtExLargePagesEnabled;
         BOOL                 mHWVirtExVPIDEnabled;
         BOOL                 mAccelerate2DVideoEnabled;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1461 +1461 @@
           fHardwareVirtExclusive(HWVIRTEXCLUSIVEDEFAULT),
           fNestedPaging(true),
+          fLargePages(false),
           fVPID(true),
           fSyntheticCpu(false),
@@ -1505 +1506 @@
                   && (fHardwareVirtExclusive    == h.fHardwareVirtExclusive)
                   && (fNestedPaging             == h.fNestedPaging)
+                  && (fLargePages               == h.fLargePages)
                   && (fVPID                     == h.fVPID)
                   && (fSyntheticCpu             == h.fSyntheticCpu)
@@ -2012 +2014 @@
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExNestedPaging")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fNestedPaging);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExLargePages")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fLargePages);
             if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVPID")))
                 pelmCPUChild->getAttributeValue("enabled", hw.fVPID);
@@ -2909 +2913 @@
     if (m->sv >= SettingsVersion_v1_10)
     {
+        pelmCPU->createChild("HardwareVirtExLargePages")->setAttribute("enabled", hw.fLargePages);
         pelmCPU->setAttribute("hotplug", hw.fCpuHotPlug);