Changeset 67159 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 31, 2017 9:30:28 AM (8 years ago)

Author:

vboxsync

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

115835

Message:

VMM/IEM: Nested Hw.virt: Fixes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (5 diffs)
• IEMAllCImpl.cpp.h (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -924 +924 @@
 {
     Assert(IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_IOIO_PROT));
-    Assert(cAddrSizeBits == 16 || cAddrSizeBits == 32 || cAddrSizeBits == 64);
+    Assert(cAddrSizeBits == 0 || cAddrSizeBits == 16 || cAddrSizeBits == 32 || cAddrSizeBits == 64);
     Assert(cbReg == 1 || cbReg == 2 || cbReg == 4 || cbReg == 8);
 
@@ -3378 +3378 @@
                                                          uint32_t uErr, uint64_t uCr2)
 {
-    Assert(IEM_IS_SVM_ENABLED(pVCpu));
+    Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx));
 
     /*
@@ -3432 +3432 @@
 #endif
         }
-        Log2(("iemHandleSvmNstGstEventIntercept: Xcpt intercept. u8Vector=%#x uExitInfo1=%#RX64, uExitInfo2=%#RX64 -> #VMEXIT\n",
-             u8Vector, uExitInfo1, uExitInfo2));
+        Log2(("iemHandleSvmNstGstEventIntercept: Xcpt intercept. u32InterceptXcpt=%#RX32 u8Vector=%#x uExitInfo1=%#RX64, uExitInfo2=%#RX64 -> #VMEXIT\n",
+             pCtx->hwvirt.svm.VmcbCtrl.u32InterceptXcpt, u8Vector, uExitInfo1, uExitInfo2));
         IEM_RETURN_SVM_NST_GST_VMEXIT(pVCpu, SVM_EXIT_EXCEPTION_0 + u8Vector, uExitInfo1, uExitInfo2);
     }
@@ -5467 +5467 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT
-    if (IEM_IS_SVM_ENABLED(pVCpu))
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
         /*
@@ -16047 +16047 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT
 /**
- * Interface for HM and EM to emulate the STGI instruction.
+ * Interface for HM and EM to emulate the CLGI instruction.
  *
  * @returns Strict VBox status code.

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5065 +5065 @@
     if (IEM_IS_SVM_READ_CR_INTERCEPT_SET(pVCpu, iCrReg))
     {
-        Log(("iemCImpl_load_Cr%#x: Guest intercept -> #VMEXIT\n", iCrReg));
+        Log(("iemCImpl_mov_Rd_Cd%#x: Guest intercept -> #VMEXIT\n", iCrReg));
         IEM_RETURN_SVM_NST_GST_CRX_VMEXIT(pVCpu, SVM_EXIT_READ_CR0 + iCrReg, IEMACCESSCRX_MOV_CRX, iGReg);
     }
@@ -5083 +5083 @@
         case 8:
         {
+#ifdef VBOX_WITH_NESTED_HWVIRT
+            if (pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIntrMasking)
+            {
+                crX = pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u8VTPR;
+                break;
+            }
+#endif
             uint8_t uTpr;
             int rc = APICGetTpr(pVCpu, &uTpr, NULL, NULL);
@@ -5434 +5441 @@
          */
         case 8:
+        {
             if (uNewCrX & ~(uint64_t)0xf)
             {
@@ -5440 +5448 @@
             }
 
-            if (IEM_IS_SVM_WRITE_CR_INTERCEPT_SET(pVCpu, /*cr*/ 8))
-            {
-                Log(("iemCImpl_load_Cr%#x: Guest intercept -> #VMEXIT\n", iCrReg));
-                IEM_RETURN_SVM_NST_GST_CRX_VMEXIT(pVCpu, SVM_EXIT_WRITE_CR8, enmAccessCrX, iGReg);
-            }
-
+            uint8_t const u8Tpr = (uint8_t)uNewCrX << 4;
+#ifdef VBOX_WITH_NESTED_HWVIRT
+            if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+            {
+                if (IEM_IS_SVM_WRITE_CR_INTERCEPT_SET(pVCpu, /*cr*/ 8))
+                {
+                    Log(("iemCImpl_load_Cr%#x: Guest intercept -> #VMEXIT\n", iCrReg));
+                    IEM_RETURN_SVM_NST_GST_CRX_VMEXIT(pVCpu, SVM_EXIT_WRITE_CR8, enmAccessCrX, iGReg);
+                }
+
+                pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u8VTPR = u8Tpr;
+                if (pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIntrMasking)
+                {
+                    rcStrict = VINF_SUCCESS;
+                    break;
+                }
+            }
+#endif
             if (!IEM_FULL_VERIFICATION_ENABLED(pVCpu))
-                APICSetTpr(pVCpu, (uint8_t)uNewCrX << 4);
+                APICSetTpr(pVCpu, u8Tpr);
             rcStrict = VINF_SUCCESS;
             break;
+        }
 
         IEM_NOT_REACHED_DEFAULT_CASE_RET(); /* call checks */
@@ -6194 +6215 @@
     }
 
-    VBOXSTRICTRC rcStrict = HMSvmVmrun(pVCpu, pCtx, GCPhysVmcb);
+    VBOXSTRICTRC rcStrict = HMSvmVmrun(pVCpu, pCtx, cbInstr, GCPhysVmcb);
     /* If VMRUN execution causes a #VMEXIT, we continue executing the instruction following the VMRUN. */
     if (rcStrict == VINF_SVM_VMEXIT)