Changeset 87557 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 3, 2021 11:07:24 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Moved fUseVmcsShadowing from HM::vmxUse to HMR0PERVM::vmx. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (6 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (2 diffs)

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

@@ -1187 +1187 @@
 
         /* Use VMCS shadowing if supported. */
-        Assert(!pVM->hm.s.vmx.fUseVmcsShadowing);
-        if (   pVM->cpum.ro.GuestFeatures.fVmx
-            && (g_HmMsrs.u.vmx.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_VMCS_SHADOWING))
-            pVM->hm.s.vmx.fUseVmcsShadowing = true;
+        pVM->hmr0.s.vmx.fUseVmcsShadowing = pVM->cpum.ro.GuestFeatures.fVmx
+                                         && (g_HmMsrs.u.vmx.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_VMCS_SHADOWING);
+        pVM->hm.s.vmx.fUseVmcsShadowingForRing3 = pVM->hmr0.s.vmx.fUseVmcsShadowing;
 
         /* Use the VMCS controls for swapping the EFER MSR if supported. */

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

@@ -1916 +1916 @@
 
     bool const fMsrBitmaps = RT_BOOL(g_HmMsrs.u.vmx.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_MSR_BITMAPS);
-    bool const fShadowVmcs = !fIsNstGstVmcs ? pVM->hm.s.vmx.fUseVmcsShadowing : pVM->cpum.ro.GuestFeatures.fVmxVmcsShadowing;
+    bool const fShadowVmcs = !fIsNstGstVmcs ? pVM->hmr0.s.vmx.fUseVmcsShadowing : pVM->cpum.ro.GuestFeatures.fVmxVmcsShadowing;
     Assert(!pVM->cpum.ro.GuestFeatures.fVmxVmcsShadowing);  /* VMCS shadowing is not yet exposed to the guest. */
     VMXPAGEALLOCINFO aAllocInfo[] =
@@ -1978 +1978 @@
     hmR0VmxPagesFree(&pVM->hmr0.s.vmx.hMemObj);
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    if (pVM->hm.s.vmx.fUseVmcsShadowing)
+    if (pVM->hmr0.s.vmx.fUseVmcsShadowing)
     {
         RTMemFree(pVM->hmr0.s.vmx.paShadowVmcsFields);
@@ -2028 +2028 @@
      */
     bool const fVirtApicAccess   = RT_BOOL(g_HmMsrs.u.vmx.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS);
-    bool const fUseVmcsShadowing = pVM->hm.s.vmx.fUseVmcsShadowing;
+    bool const fUseVmcsShadowing = pVM->hmr0.s.vmx.fUseVmcsShadowing;
     VMXPAGEALLOCINFO aAllocInfo[] =
     {
@@ -4050 +4050 @@
 {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fUseVmcsShadowing)
+    if (pVCpu->CTX_SUFF(pVM)->hmr0.s.vmx.fUseVmcsShadowing)
     {
         hmR0VmxSetupVmcsVmreadBitmapAddr(pVCpu);
@@ -4561 +4561 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     /* Setup the shadow VMCS fields array and VMREAD/VMWRITE bitmaps. */
-    if (pVM->hm.s.vmx.fUseVmcsShadowing)
+    if (pVM->hmr0.s.vmx.fUseVmcsShadowing)
     {
         rc = hmR0VmxSetupShadowVmcsFieldsArrays(pVM);
@@ -5589 +5589 @@
          * VMCS shadowing.
          */
-        if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fUseVmcsShadowing)
+        if (pVCpu->CTX_SUFF(pVM)->hmr0.s.vmx.fUseVmcsShadowing)
         {
             /*

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1740 +1740 @@
         LogRel(("HM: Enabled posted-interrupt processing support\n"));
 
-    if (pVM->hm.s.vmx.fUseVmcsShadowing)
+    if (pVM->hm.s.vmx.fUseVmcsShadowingForRing3)
     {
         bool const fFullVmcsShadow = RT_BOOL(pVM->hm.s.vmx.MsrsForRing3.u64Misc & VMX_MISC_VMWRITE_ALL);

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

@@ -520 +520 @@
         bool                        fSupportsVmcsEferForRing3;
         /** Whether to use VMCS shadowing. */
-        bool                        fUseVmcsShadowing;
+        bool                        fUseVmcsShadowingForRing3;
         /** Set if Last Branch Record (LBR) is enabled. */
         bool                        fLbr;
@@ -647 +647 @@
         /** Set if the preemption timer is in use. */
         bool                        fUsePreemptTimer;
-        bool                        afAlignment1[2];
+        /** Whether to use VMCS shadowing. */
+        bool                        fUseVmcsShadowing;
+        bool                        afAlignment1[1];
         /** Set if VPID is supported (copy in HM::vmx::fVpidForRing3). */
         bool                        fVpid;