Changeset 67157 in vbox

Timestamp:

May 31, 2017 9:11:17 AM (8 years ago)

Author:

vboxsync

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

115833

Message:

VMM/CPUM: Nested Hw.virt: fixes.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (6 diffs)

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

@@ -756 +756 @@
 static void cpumR3FreeHwVirtState(PVM pVM)
 {
-    if (pVM->cpum.ro.GuestFeatures.fSvm)
-    {
-        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    Assert(pVM->cpum.ro.GuestFeatures.fSvm);
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        if (pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3)
         {
-            PVMCPU pVCpu = &pVM->aCpus[i];
-            if (pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3)
-            {
-                SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3, SVM_MSRPM_PAGES);
-                pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3 = NULL;
-            }
-
-            if (pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3)
-            {
-                SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3, SVM_IOPM_PAGES);
-                pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3 = NULL;
-            }
+            SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3, SVM_MSRPM_PAGES);
+            pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3 = NULL;
+        }
+
+        if (pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3)
+        {
+            SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3, SVM_IOPM_PAGES);
+            pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3 = NULL;
         }
     }
@@ -785 +783 @@
 static int cpumR3AllocHwVirtState(PVM pVM)
 {
+    Assert(pVM->cpum.ro.GuestFeatures.fSvm);
+
     int rc = VINF_SUCCESS;
-    if (pVM->cpum.ro.GuestFeatures.fSvm)
-    {
-        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    LogRel(("CPUM: Allocating a total of %u pages for the nested-guest SVM MSR and IO permission bitmaps\n",
+            pVM->cCpus * (SVM_MSRPM_PAGES + SVM_IOPM_PAGES)));
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        /*
+         * Allocate the MSRPM (MSR Permission bitmap).
+         */
+        Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3);
+        rc = SUPR3PageAllocEx(SVM_MSRPM_PAGES, 0 /* fFlags */, &pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3,
+                              &pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR0, NULL /* paPages */);
+        if (RT_FAILURE(rc))
         {
-            PVMCPU pVCpu = &pVM->aCpus[i];
-
-            /*
-             * Allocate the MSRPM (MSR Permission bitmap).
-             */
             Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3);
-            rc = SUPR3PageAllocEx(SVM_MSRPM_PAGES, 0 /* fFlags */, &pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3,
-                                  &pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR0, NULL /* paPages */);
-            if (RT_FAILURE(rc))
-            {
-                Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3);
-                LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's MSR permission bitmap\n", pVCpu->idCpu,
-                        SVM_MSRPM_PAGES));
-                break;
-            }
-
-            /*
-             * Allocate the IOPM (IO Permission bitmap).
-             */
+            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's MSR permission bitmap\n", pVCpu->idCpu,
+                    SVM_MSRPM_PAGES));
+            break;
+        }
+
+        /*
+         * Allocate the IOPM (IO Permission bitmap).
+         */
+        Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3);
+        rc = SUPR3PageAllocEx(SVM_IOPM_PAGES, 0 /* fFlags */, &pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3,
+                              &pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR0, NULL /* paPages */);
+        if (RT_FAILURE(rc))
+        {
             Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3);
-            rc = SUPR3PageAllocEx(SVM_IOPM_PAGES, 0 /* fFlags */, &pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3,
-                                  &pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR0, NULL /* paPages */);
-            if (RT_FAILURE(rc))
-            {
-                Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3);
-                LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's IO permission bitmap\n", pVCpu->idCpu,
-                        SVM_IOPM_PAGES));
-                break;
-            }
+            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's IO permission bitmap\n", pVCpu->idCpu,
+                    SVM_IOPM_PAGES));
+            break;
         }
-
-        /* On any failure, cleanup. */
-        if (RT_FAILURE(rc))
-            cpumR3FreeHwVirtState(pVM);
-    }
+    }
+
+    /* On any failure, cleanup. */
+    if (RT_FAILURE(rc))
+        cpumR3FreeHwVirtState(pVM);
 
     return rc;
@@ -966 +965 @@
 
     /*
-     * Allocate memory required by the hardware virtualization state.
-     */
-    rc = cpumR3AllocHwVirtState(pVM);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /*
      * Register saved state data item.
      */
@@ -1012 +1004 @@
     if (RT_FAILURE(rc))
         return rc;
+
+    /*
+     * Allocate memory required by the guest hardware virtualization state.
+     */
+    if (pVM->cpum.ro.GuestFeatures.fSvm)
+    {
+        rc = cpumR3AllocHwVirtState(pVM);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
     CPUMR3Reset(pVM);
     return VINF_SUCCESS;
@@ -1093 +1096 @@
 #endif
 
-    cpumR3FreeHwVirtState(pVM);
+    if (pVM->cpum.ro.GuestFeatures.fSvm)
+        cpumR3FreeHwVirtState(pVM);
     return VINF_SUCCESS;
 }
@@ -1241 +1245 @@
      * Hardware virtualization state.
      */
-    memset(&pCtx->hwvirt, 0, sizeof(pCtx->hwvirt));
     /* SVM. */
+    RT_ZERO(pCtx->hwvirt.svm.VmcbCtrl);
     pCtx->hwvirt.svm.fGif = 1;
 }