Changeset 13221

Timestamp:

10/13/08 16:43:54 (3 months ago)

Author:

vboxsync

Message:

Enabled VPID (VT-x tagged TLB); default off
- Added machine & machine debugger property
- Added -vtxvpid option to VBoxManage

Files:

• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (5 diffs)
• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)
• trunk/src/VBox/Main/MachineDebuggerImpl.cpp (modified) (1 diff)
• trunk/src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)
• trunk/src/VBox/Main/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Main/idl/VirtualBox.xidl (modified) (4 diffs)
• trunk/src/VBox/Main/include/MachineDebuggerImpl.h (modified) (1 diff)
• trunk/src/VBox/Main/include/MachineImpl.h (modified) (2 diffs)
• trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)
• trunk/src/VBox/VMM/HWACCM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/HWACCMInternal.h (modified) (3 diffs)

trunk/include/VBox/hwaccm.h

@@ -111 +111 @@
-VMMR3DECL(bool) HWACCMR3IsAllowed(PVM pVM);
-VMMR3DECL(void) HWACCMR3PagingModeChanged(PVM pVM, PGMMODE enmShadowMode);
+VMMR3DECL(bool) HWACCMR3IsVPIDActive(PVM pVM);
+
-/** @} */
-#endif /* IN_RING3 */

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

@@ -334 +334 @@
-                 "                            [-hwvirtex on|off|default]\n"
-                 "                            [-nestedpaging on|off]\n"
+                 "                            [-vtxvpid on|off]\n"
-                 "                            [-monitorcount <number>]\n"
-                 "                            [-bioslogofadein on|off]\n"
@@ -998 +999 @@
-    else
-        RTPrintf("Nested Paging:   %s\n", HWVirtExNestedPagingEnabled ? "on" : "off");
+
+    BOOL HWVirtExVPIDEnabled;
+    machine->COMGETTER(HWVirtExVPIDEnabled)(&HWVirtExVPIDEnabled);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("vtxvpid=\"%s\"\n", HWVirtExVPIDEnabled ? "on" : "off");
+    else
+        RTPrintf("VT-x VPID:   %s\n", HWVirtExVPIDEnabled ? "on" : "off");
-
-    MachineState_T machineState;
@@ -3798 +3806 @@
-    char *hwvirtex = NULL;
-    char *nestedpaging = NULL;
+    char *vtxvpid = NULL;
-    char *pae = NULL;
-    char *ioapic = NULL;
@@ -3931 +3940 @@
-            nestedpaging = argv[i];
-        }
+        else if (strcmp(argv[i], "-vtxvpid") == 0)
+        {
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            vtxvpid = argv[i];
+        }
-        else if (strcmp(argv[i], "-pae") == 0)
-        {
@@ -4577 +4593 @@
-            {
-                errorArgument("Invalid -nestedpaging argument '%s'", ioapic);
+                rc = E_FAIL;
+                break;
+            }
+        }
+        if (vtxvpid)
+        {
+            if (strcmp(vtxvpid, "on") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExVPIDEnabled)(true));
+            }
+            else if (strcmp(vtxvpid, "off") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExVPIDEnabled)(false));
+            }
+            else
+            {
+                errorArgument("Invalid -vtxvpid argument '%s'", ioapic);
-                rc = E_FAIL;
-                break;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -189 +189 @@
-    hrc = pMachine->COMGETTER(HWVirtExNestedPagingEnabled)(&fEnableNestedPaging);   H();
-    rc = CFGMR3InsertInteger(pRoot, "EnableNestedPaging", fEnableNestedPaging);     RC_CHECK();
+
+    /* VPID (VT-x) */
+    BOOL fEnableVPID = false;
+    hrc = pMachine->COMGETTER(HWVirtExVPIDEnabled)(&fEnableVPID);   H();
+    rc = CFGMR3InsertInteger(pRoot, "EnableVPID", fEnableVPID);     RC_CHECK();
-
-    /* Physical Address Extension (PAE) */

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -552 +552 @@
-
-/**
+ * Returns the current VPID flag.
+ *
+ * @returns COM status code
+ * @param   enabled address of result variable
+ */
+STDMETHODIMP MachineDebugger::COMGETTER(HWVirtExVPIDEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoWriteLock alock (this);
+    CHECK_READY();
+
+    Console::SafeVMPtrQuiet pVM (mParent);
+    if (pVM.isOk())
+        *enabled = HWACCMR3IsVPIDActive(pVM.raw());
+    else
+        *enabled = false;
+    return S_OK;
+}
+
+/**
- * Returns the current PAE flag.
- *

trunk/src/VBox/Main/MachineImpl.cpp

@@ -191 +191 @@
-    mHWVirtExEnabled = TSBool_False;
-    mHWVirtExNestedPagingEnabled = false;
+    mHWVirtExVPIDEnabled = false;
-    mPAEEnabled = false;
-
@@ -219 +220 @@
-        mHWVirtExEnabled != that.mHWVirtExEnabled ||
-        mHWVirtExNestedPagingEnabled != that.mHWVirtExNestedPagingEnabled ||
+        mHWVirtExVPIDEnabled != that.mHWVirtExVPIDEnabled ||
-        mPAEEnabled != that.mPAEEnabled ||
-        mClipboardMode != that.mClipboardMode)
@@ -1153 +1155 @@
-}
-
+STDMETHODIMP Machine::COMGETTER(HWVirtExVPIDEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *enabled = mHWData->mHWVirtExVPIDEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(HWVirtExVPIDEnabled)(BOOL enable)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    /** @todo check validity! */
+
+    mHWData.backup();
+    mHWData->mHWVirtExVPIDEnabled = enable;
+
+    return S_OK;
+}
-
-STDMETHODIMP Machine::COMGETTER(PAEEnabled)(BOOL *enabled)
@@ -4758 +4792 @@
-        mHWData->mHWVirtExEnabled             = TSBool_Default;
-        mHWData->mHWVirtExNestedPagingEnabled = false;
+        mHWData->mHWVirtExVPIDEnabled         = false;
-        mHWData->mPAEEnabled                  = false;
-
@@ -4779 +4814 @@
-            {
-                mHWData->mHWVirtExNestedPagingEnabled = HWVirtExNestedPagingNode.value <bool> ("enabled");
+            }
+
+            /* HardwareVirtExVPID (optional, default is false) */
+            Key HWVirtExVPIDNode = cpuNode.findKey ("HardwareVirtExVPID");
+            if (!HWVirtExVPIDNode.isNull())
+            {
+                mHWData->mHWVirtExVPIDEnabled = HWVirtExVPIDNode.value <bool> ("enabled");
-            }
-
@@ -6172 +6214 @@
-        hwVirtExNode.setStringValue ("enabled", value);
-
-tru
+fals
-        Key HWVirtExNestedPagingNode = cpuNode.createKey ("HardwareVirtExNestedPaging");
-        HWVirtExNestedPagingNode.setValue <bool> ("enabled", !!mHWData->mHWVirtExNestedPagingEnabled);
-
+
+
+
+
+
-        /* PAE (optional, default is false) */
-        Key PAENode = cpuNode.createKey ("PAE");

trunk/src/VBox/Main/Makefile.kmk

@@ -27 +27 @@
-# Include sub-makefile(s).
-#
-
-
-
+#
+#
+#
-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-

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

@@ -2645 +2645 @@
-  <interface
-     name="IMachine" extends="$unknown"
-1e509de4-d96c-4f44-8b94-860194f710ac
+9797b8f2-0631-4db8-813d-4c63356b223b
-     wsmap="managed"
-     >
@@ -2876 +2876 @@
-    </attribute>
-
+    <attribute name="HWVirtExVPIDEnabled" type="boolean" default="false">
+      <desc>
+        This setting determines whether VirtualBox will try to make use of
+        the VPID extension of Intel VT-x. Note that in case such extensions are
+        not available, they will not be used.
+      </desc>
+    </attribute>
+
-    <attribute name="PAEEnabled" type="boolean" default="false">
-      <desc>
@@ -8871 +8879 @@
-  <interface
-     name="IMachineDebugger" extends="$unknown"
-54ebce96-fa7d-4a4d-bc81-a7db41c29637
+0de52346-938b-4020-a33b-471be542f3ff
-     wsmap="suppress"
-     >
@@ -8942 +8950 @@
-        Flag indicating whether the VM is currently making use of the nested paging
-        CPU hardware virtualization extension.
+      </desc>
+    </attribute>
+
+    <attribute name="HWVirtExVPIDEnabled" type="boolean" readonly="yes">
+      <desc>
+        Flag indicating whether the VM is currently making use of the VPID
+        VT-x extension.
-      </desc>
-    </attribute>

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

@@ -68 +68 @@
-    STDMETHOD(COMGETTER(HWVirtExEnabled))(BOOL *enabled);
-    STDMETHOD(COMGETTER(HWVirtExNestedPagingEnabled))(BOOL *enabled);
+    STDMETHOD(COMGETTER(HWVirtExVPIDEnabled))(BOOL *enabled);
-    STDMETHOD(COMGETTER(PAEEnabled))(BOOL *enabled);
-    STDMETHOD(COMGETTER(VirtualTimeRate))(ULONG *pct);

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

@@ -255 +255 @@
-        TSBool_T       mHWVirtExEnabled;
-        BOOL           mHWVirtExNestedPagingEnabled;
+        BOOL           mHWVirtExVPIDEnabled;
-        BOOL           mPAEEnabled;
-
@@ -489 +490 @@
-    STDMETHOD(COMGETTER(HWVirtExNestedPagingEnabled))(BOOL *enabled);
-    STDMETHOD(COMSETTER(HWVirtExNestedPagingEnabled))(BOOL enabled);
+    STDMETHOD(COMGETTER(HWVirtExVPIDEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(HWVirtExVPIDEnabled))(BOOL enabled);
-    STDMETHOD(COMGETTER(PAEEnabled))(BOOL *enabled);
-    STDMETHOD(COMSETTER(PAEEnabled))(BOOL enabled);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -417 +417 @@
-</xsd:complexType>
-
+<xsd:complexType name="THWVirtExVPIDType">
+  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+</xsd:complexType>
+
-<xsd:complexType name="TPAEType">
-  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
@@ -425 +429 @@
-    <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/>
-    <xsd:element name="HardwareVirtExNestedPaging" type="THWVirtExNestedPagingType" minOccurs="0"/>
+    <xsd:element name="HardwareVirtExVPID" type="THWVirtExVPIDType" minOccurs="0"/>
-    <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
-  </xsd:sequence>

trunk/src/VBox/VMM/HWACCM.cpp

@@ -195 +195 @@
-    /* Nested paging: disabled by default. */
-    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnableNestedPaging", &pVM->hwaccm.s.fAllowNestedPaging, false);
+    AssertRC(rc);
+
+    /* VT-x VPID: disabled by default. */
+    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnableVPID", &pVM->hwaccm.s.fAllowVPID, false);
-    AssertRC(rc);
-
@@ -576 +580 @@
-#endif /* HWACCM_VTX_WITH_EPT */
-#ifdef HWACCM_VTX_WITH_VPID
-else
-if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VPID)
-true
+if (    (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VPID)
+    &&  !pVM->hwaccm.s.fNestedPaging)    /* VPID and EPT are mutually exclusive. */
+pVM->hwaccm.s.fAllowVPID
-#endif /* HWACCM_VTX_WITH_VPID */
-
@@ -954 +958 @@
-
-/**
+ * Checks if we are currently using VPID in VT-x mode.
+ *
+ * @returns boolean
+ * @param   pVM         The VM to operate on.
+ */
+VMMR3DECL(bool) HWACCMR3IsVPIDActive(PVM pVM)
+{
+    return pVM->hwaccm.s.vmx.fVPID;
+}
+
+
+/**
- * Checks if internal events are pending. In that case we are not allowed to dispatch interrupts.
- *

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -42 +42 @@
-#define HWACCM_VMX_EMULATE_REALMODE
-#define HWACCM_VTX_WITH_EPT
+#define HWACCM_VTX_WITH_VPID
-
-__BEGIN_DECLS
@@ -189 +190 @@
-    /** Set if nested paging is allowed. */
-    bool                        fAllowNestedPaging;
+    /** Set if VT-x VPID is allowed. */
+    bool                        fAllowVPID;
-
-    /** Set if we need to flush the TLB during the world switch. */
@@ -196 +199 @@
-    bool                        fFPUOldStyleOverride;
-
+#if 0
-    /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
-     *  naturally. */
-    bool                        padding[1];
+#endif
-
-    /** HWACCM_CHANGED_* flags. */