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

Timestamp:

Aug 18, 2020 7:24:05 AM (5 years ago)

Author:

vboxsync

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

139963

Message:

HMSVMR0: bugref:9618 Virtualized VMSAVE/VMLOAD fix.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

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

@@ -999 +999 @@
     /* Set up unconditional intercepts and conditions. */
     pVmcbCtrl0->u64InterceptCtrl = HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS
-                                 | SVM_CTRL_INTERCEPT_VMMCALL;
+                                 | SVM_CTRL_INTERCEPT_VMMCALL
+                                 | SVM_CTRL_INTERCEPT_VMSAVE
+                                 | SVM_CTRL_INTERCEPT_VMLOAD
+                                 | SVM_CTRL_INTERCEPT_CLGI
+                                 | SVM_CTRL_INTERCEPT_STGI;
 
 #ifdef HMSVM_ALWAYS_TRAP_TASK_SWITCH
@@ -1006 +1010 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-    /* Virtualized VMSAVE/VMLOAD. */
-    pVmcbCtrl0->LbrVirt.n.u1VirtVmsaveVmload = fUseVirtVmsaveVmload;
-    if (!fUseVirtVmsaveVmload)
-        pVmcbCtrl0->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_VMSAVE
-                                     |  SVM_CTRL_INTERCEPT_VMLOAD;
-
-    /* Virtual GIF. */
-    pVmcbCtrl0->IntCtrl.n.u1VGifEnable = fUseVGif;
-    if (!fUseVGif)
-        pVmcbCtrl0->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_CLGI
-                                     |  SVM_CTRL_INTERCEPT_STGI;
+    if (pVCpu0->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fSvm)
+    {
+        /* Virtualized VMSAVE/VMLOAD. */
+        if (fUseVirtVmsaveVmload)
+        {
+            pVmcbCtrl0->LbrVirt.n.u1VirtVmsaveVmload = 1;
+            pVmcbCtrl0->u64InterceptCtrl &= ~(  SVM_CTRL_INTERCEPT_VMSAVE
+                                              | SVM_CTRL_INTERCEPT_VMLOAD);
+        }
+        else
+            Assert(!pVmcbCtrl0->LbrVirt.n.u1VirtVmsaveVmload);
+
+        /* Virtual GIF. */
+        if (fUseVGif)
+        {
+            pVmcbCtrl0->IntCtrl.n.u1VGifEnable = 1;
+            pVmcbCtrl0->u64InterceptCtrl &= ~(  SVM_CTRL_INTERCEPT_CLGI
+                                              | SVM_CTRL_INTERCEPT_STGI);
+        }
+        else
+            Assert(!pVmcbCtrl0->IntCtrl.n.u1VGifEnable);
+    }
+    else
 #endif
+    {
+        Assert(!pVCpu0->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fSvm);
+        Assert(!pVmcbCtrl0->LbrVirt.n.u1VirtVmsaveVmload);
+        Assert(!pVmcbCtrl0->IntCtrl.n.u1VGifEnable);
+    }
 
     /* CR4 writes must always be intercepted for tracking PGM mode changes. */