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

Timestamp:

Jul 12, 2017 11:13:08 AM (8 years ago)

Author:

vboxsync

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

116917

Message:

VMM/IEM: Nested Hw.virt: Fixes for dynamically allocated nested-guest VMCB.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllCImpl.cpp.h (modified) (2 diffs)
• IEMAllCImplSvmInstr.cpp.h (modified) (11 diffs)

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

@@ -5089 +5089 @@
         {
 #ifdef VBOX_WITH_NESTED_HWVIRT
-            if (pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIntrMasking)
-            {
-                crX = pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u8VTPR;
+            PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+            if (pVmcbCtrl->IntCtrl.n.u1VIntrMasking)
+            {
+                crX = pVmcbCtrl->IntCtrl.n.u8VTPR;
                 break;
             }
@@ -5463 +5464 @@
                 }
 
-                pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u8VTPR = u8Tpr;
-                if (pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIntrMasking)
+                PSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+                pVmcbCtrl->IntCtrl.n.u8VTPR = u8Tpr;
+                if (pVmcbCtrl->IntCtrl.n.u1VIntrMasking)
                 {
                     rcStrict = VINF_SUCCESS;

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

@@ -147 +147 @@
         Assert(CPUMGetGuestCPL(pVCpu) == pCtx->ss.Attr.n.u2Dpl);
 
+        PSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
         /* Save interrupt shadow of the nested-guest instruction if any. */
         if (   VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
@@ -152 +153 @@
         {
             LogFlow(("iemSvmVmexit: Interrupt shadow till %#RX64\n", pCtx->rip));
-            pCtx->hwvirt.svm.VmcbCtrl.u64IntShadow |= SVM_INTERRUPT_SHADOW_ACTIVE;
+            pVmcbCtrl->u64IntShadow |= SVM_INTERRUPT_SHADOW_ACTIVE;
         }
 
@@ -160 +161 @@
         if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST))
         {
-            Assert(pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIrqPending);
+            Assert(pVmcbCtrl->IntCtrl.n.u1VIrqPending);
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST);
         }
         else
-            pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u1VIrqPending = 0;
+            pVmcbCtrl->IntCtrl.n.u1VIrqPending = 0;
 
         /** @todo Save V_TPR, V_IRQ. */
@@ -170 +171 @@
 
         /* Save exit information. */
-        pCtx->hwvirt.svm.VmcbCtrl.u64ExitCode  = uExitCode;
-        pCtx->hwvirt.svm.VmcbCtrl.u64ExitInfo1 = uExitInfo1;
-        pCtx->hwvirt.svm.VmcbCtrl.u64ExitInfo2 = uExitInfo2;
+        pVmcbCtrl->u64ExitCode  = uExitCode;
+        pVmcbCtrl->u64ExitInfo1 = uExitInfo1;
+        pVmcbCtrl->u64ExitInfo2 = uExitInfo2;
 
         /*
@@ -184 +185 @@
             bool const fRaisingEvent = IEMGetCurrentXcpt(pVCpu, &uExitIntVector, &fExitIntFlags, &uExitIntErr,
                                                          NULL /* uExitIntCr2 */);
-            pCtx->hwvirt.svm.VmcbCtrl.ExitIntInfo.n.u1Valid = fRaisingEvent;
+            pVmcbCtrl->ExitIntInfo.n.u1Valid = fRaisingEvent;
             if (fRaisingEvent)
             {
-                pCtx->hwvirt.svm.VmcbCtrl.ExitIntInfo.n.u8Vector = uExitIntVector;
-                pCtx->hwvirt.svm.VmcbCtrl.ExitIntInfo.n.u3Type   = iemGetSvmEventType(uExitIntVector, fExitIntFlags);
+                pVmcbCtrl->ExitIntInfo.n.u8Vector = uExitIntVector;
+                pVmcbCtrl->ExitIntInfo.n.u3Type   = iemGetSvmEventType(uExitIntVector, fExitIntFlags);
                 if (fExitIntFlags & IEM_XCPT_FLAGS_ERR)
                 {
-                    pCtx->hwvirt.svm.VmcbCtrl.ExitIntInfo.n.u1ErrorCodeValid = true;
-                    pCtx->hwvirt.svm.VmcbCtrl.ExitIntInfo.n.u32ErrorCode     = uExitIntErr;
+                    pVmcbCtrl->ExitIntInfo.n.u1ErrorCodeValid = true;
+                    pVmcbCtrl->ExitIntInfo.n.u32ErrorCode     = uExitIntErr;
                 }
             }
@@ -200 +201 @@
          * Clear event injection in the VMCB.
          */
-        pCtx->hwvirt.svm.VmcbCtrl.EventInject.n.u1Valid = 0;
+        pVmcbCtrl->EventInject.n.u1Valid = 0;
 
         /*
          * Write back the VMCB controls to the guest VMCB in guest physical memory.
          */
-        VBOXSTRICTRC rcStrict = PGMPhysSimpleWriteGCPhys(pVCpu->CTX_SUFF(pVM), pCtx->hwvirt.svm.GCPhysVmcb,
-                                                         &pCtx->hwvirt.svm.VmcbCtrl, sizeof(pCtx->hwvirt.svm.VmcbCtrl));
+        VBOXSTRICTRC rcStrict = PGMPhysSimpleWriteGCPhys(pVCpu->CTX_SUFF(pVM), pCtx->hwvirt.svm.GCPhysVmcb, pVmcbCtrl,
+                                                         sizeof(*pVmcbCtrl));
         /*
          * Prepare for guest's "host mode" by clearing internal processor state bits.
@@ -214 +215 @@
          * back the VMCB controls above.
          */
-        RT_ZERO(pCtx->hwvirt.svm.VmcbCtrl);
+        memset(pVmcbCtrl, 0, sizeof(*pVmcbCtrl));
 
         if (RT_SUCCESS(rcStrict))
@@ -328 +329 @@
 
     /*
-     * Save host state.
+     * Read the guest VMCB state.
      */
     SVMVMCBSTATESAVE VmcbNstGst;
@@ -334 +335 @@
     if (RT_SUCCESS(rc))
     {
+        /*
+         * Save the host state.
+         */
         PSVMHOSTSTATE pHostState = &pCtx->hwvirt.svm.HostState;
         pHostState->es         = pCtx->es;
@@ -351 +355 @@
 
         /*
-         * Load the VMCB controls.
+         * Read the guest VMCB controls.
          */
-        rc = PGMPhysSimpleReadGCPhys(pVM, &pCtx->hwvirt.svm.VmcbCtrl, GCPhysVmcb, sizeof(pCtx->hwvirt.svm.VmcbCtrl));
+        PSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+        rc = PGMPhysSimpleReadGCPhys(pVM, pVmcbCtrl, GCPhysVmcb, sizeof(*pVmcbCtrl));
         if (RT_SUCCESS(rc))
         {
-            PSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
-
             /*
              * Validate guest-state and controls.
@@ -928 +931 @@
             AssertReleaseFailedReturn(VERR_IEM_IPE_5);
 #else
+            PSVMVMCBCTRL  pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
             uint8_t const offOpCode = pVCpu->iem.s.offOpcode;
             uint8_t const cbCurrent = pVCpu->iem.s.cbOpcode - pVCpu->iem.s.offOpcode;
             if (   cbCurrent > 0
-                && cbCurrent < sizeof(pCtx->hwvirt.svm.VmcbCtrl.abInstr))
+                && cbCurrent < sizeof(pVmcbCtrl->abInstr))
             {
                 Assert(cbCurrent <= sizeof(pVCpu->iem.s.abOpcode));
-                memcpy(&pCtx->hwvirt.svm.VmcbCtrl.abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], cbCurrent);
+                memcpy(&pVmcbCtrl->abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], cbCurrent);
             }
 #endif
         }
-        Log2(("iemHandleSvmNstGstEventIntercept: Xcpt intercept. u32InterceptXcpt=%#RX32 u8Vector=%#x uExitInfo1=%#RX64, uExitInfo2=%#RX64 -> #VMEXIT\n",
-             pCtx->hwvirt.svm.VmcbCtrl.u32InterceptXcpt, u8Vector, uExitInfo1, uExitInfo2));
+        Log2(("iemHandleSvmNstGstEventIntercept: Xcpt intercept u32InterceptXcpt=%#RX32 u8Vector=%#x "
+              "uExitInfo1=%#RX64 uExitInfo2=%#RX64 -> #VMEXIT\n", pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl.u32InterceptXcpt,
+              u8Vector, uExitInfo1, uExitInfo2));
         IEM_RETURN_SVM_VMEXIT(pVCpu, SVM_EXIT_EXCEPTION_0 + u8Vector, uExitInfo1, uExitInfo2);
     }