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

Timestamp:

Mar 9, 2017 3:39:05 PM (8 years ago)

Author:

vboxsync

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

113871

Message:

VMM: Nested Hw.virt: Bits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMSVMAll.cpp (modified) (5 diffs)
• IEMAllCImpl.cpp.h (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp ¶

@@ -182 +182 @@
  * @param   pVCpu               The cross context virtual CPU structure.
  * @param   pCtx                Pointer to the guest-CPU context.
- */
-VMM_INT_DECL(VBOXSTRICTRC) HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    RT_NOREF2(pVCpu, pCtx);
+ * @param   pVmcb               The VMCB of the nested-guest.
+ * @param   pHostState          The host-state save area in the guest.
+ */
+VMM_INT_DECL(VBOXSTRICTRC) HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, PSVMHOSTSTATE pHostState)
+{
+    Assert(pHostState);
+    Assert(pVmcb);
+
+    /*
+     * Save host state.
+     */
+    pHostState->es       = pCtx->es;
+    pHostState->cs       = pCtx->cs;
+    pHostState->ss       = pCtx->ss;
+    pHostState->ds       = pCtx->ds;
+    pHostState->gdtr     = pCtx->gdtr;
+    pHostState->idtr     = pCtx->idtr;
+    pHostState->uEferMsr = pCtx->msrEFER;
+    pHostState->uCr0     = pCtx->cr0;
+    pHostState->uCr3     = pCtx->cr3;
+    pHostState->uCr4     = pCtx->cr4;
+    pHostState->rflags   = pCtx->rflags;
+    pHostState->uRip     = pCtx->rip;
+    pHostState->uRsp     = pCtx->rsp;
+    pHostState->uRax     = pCtx->rax;
+
+    /*
+     * Load controls from VMCB.
+     */
+    pCtx->hwvirt.svm.u16InterceptRdCRx = pVmcb->ctrl.u16InterceptRdCRx;
+    pCtx->hwvirt.svm.u16InterceptWrCRx = pVmcb->ctrl.u16InterceptWrCRx;
+    pCtx->hwvirt.svm.u16InterceptRdDRx = pVmcb->ctrl.u16InterceptRdDRx;
+    pCtx->hwvirt.svm.u16InterceptWrDRx = pVmcb->ctrl.u16InterceptWrDRx;
+    pCtx->hwvirt.svm.u64InterceptCtrl  = pVmcb->ctrl.u64InterceptCtrl;
+    pCtx->hwvirt.svm.u32InterceptXcpt  = pVmcb->ctrl.u32InterceptXcpt;
+    if (!(pVmcb->ctrl.u64InterceptCtrl & SVM_CTRL_INTERCEPT_VMRUN))
+    {
+        Log(("HMSvmVmRun: VMRUN instruction not intercepted -> #VMEXIT\n"));
+        return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_INVALID, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
+    }
+    if (!pVmcb->ctrl.TLBCtrl.n.u32ASID)
+    {
+        Log(("HMSvmVmRun: Guest ASID is invalid -> #VMEXIT\n"));
+        return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_INVALID, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
+    }
+
+
+    /** @todo the rest. */
 
     return VERR_NOT_IMPLEMENTED;
@@ -197 +241 @@
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        The guest-CPU context.
- * @param   iExitCode   The exit reason.
+ * @param   uExitCode   The exit code.
  * @param   uExitInfo1  The exit info. 1 field.
  * @param   uExitInfo2  The exit info. 2 field.
  */
-VMM_INT_DECL(VBOXSTRICTRC) HMSvmNstGstVmExit(PVMCPU pVCpu, PCPUMCTX pCtx, int64_t iExitCode, uint64_t uExitInfo1,
+VMM_INT_DECL(VBOXSTRICTRC) HMSvmNstGstVmExit(PVMCPU pVCpu, PCPUMCTX pCtx, uint64_t uExitCode, uint64_t uExitInfo1,
                                              uint64_t uExitInfo2)
 {
     if (   CPUMIsGuestInNestedHwVirtMode(pCtx)
-        || iExitCode == SVM_EXIT_INVALID)
+        || uExitCode == SVM_EXIT_INVALID)
     {
         RT_NOREF(pVCpu);
@@ -211 +255 @@
         pCtx->hwvirt.svm.fGif = 0;
 
-        /** @todo implement VMEXIT. */
+        /** @todo implement \#VMEXIT. */
 
         return VINF_SUCCESS;
@@ -217 +261 @@
     else
     {
-        Log(("HMNstGstSvmVmExit: Not in SVM guest mode! uExitCode=%RI64 uExitInfo1=%RU64 uExitInfo2=%RU64\n", iExitCode,
+        Log(("HMNstGstSvmVmExit: Not in SVM guest mode! uExitCode=%#RX64 uExitInfo1=%#RX64 uExitInfo2=%#RX64\n", uExitCode,
              uExitInfo1, uExitInfo2));
         RT_NOREF2(uExitInfo1, uExitInfo2);
@@ -225 +269 @@
 }
 
-
-/**
- * Peforms the functions of a VMRUN instruction.
- *
- * @returns Strict VBox status code.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pCtx        The guest-CPU context.
- */
-VMM_INT_DECL(VBOXSTRICTRC) HMSvmVmRun(PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    RT_NOREF2(pVCpu, pCtx);
-    return VERR_NOT_IMPLEMENTED;
-}
-

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

@@ -5895 +5895 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_VMRUN))
     {
-        Log(("vmrun: Guest intercept -> VMexit\n"));
+        Log(("vmrun: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_VMMCALL, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
 #endif
 
-    /** @todo think - I probably need to map both the HSAVE area page and the
-     *        guest VMCB via iemMemPageMap here and do the copying? */
-    pCtx->hwvirt.svm.GCPhysNstGstVmcb = GCPhysVmcb;
     void *pvVmcb;
     PGMPAGEMAPLOCK PgLockVmcb;
     VBOXSTRICTRC rcStrict = iemMemPageMap(pVCpu, GCPhysVmcb, IEM_ACCESS_DATA_RW, &pvVmcb, &PgLockVmcb);
     if (rcStrict == VINF_SUCCESS)
-        return HMSvmVmrun(pVCpu, pCtx);
+    {
+        pCtx->hwvirt.svm.GCPhysNstGstVmcb = GCPhysVmcb;
+
+        RTGCPHYS GCPhysHostState = pCtx->hwvirt.svm.uMsrHSavePa;
+        /** @todo SVM does not validate the host-state area beyond checking the
+         *        alignment and range of the physical address. Nothing to prevent users
+         *        from using MMIO or other weird stuff in which case anything might
+         *        happen. */
+        void *pvHostState;
+        PGMPAGEMAPLOCK PgLockHostState;
+        rcStrict = iemMemPageMap(pVCpu, GCPhysHostState, IEM_ACCESS_DATA_RW, &pvHostState, &PgLockHostState);
+        if (rcStrict == VINF_SUCCESS)
+        {
+            PSVMHOSTSTATE pHostState = (PSVMHOSTSTATE)pvHostState;
+            PSVMVMCB      pVmcb      = (PSVMVMCB)pvVmcb;
+            rcStrict = HMSvmVmrun(pVCpu, pCtx, pVmcb, pHostState);
+
+            iemMemPageUnmap(pVCpu, GCPhysHostState, IEM_ACCESS_DATA_RW, pvHostState, &PgLockHostState);
+        }
+        iemMemPageUnmap(pVCpu, GCPhysVmcb, IEM_ACCESS_DATA_RW, pvVmcb, &PgLockVmcb);
+    }
     RT_NOREF(cbInstr);
     return rcStrict;
@@ -5922 +5939 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_VMMCALL))
     {
-        Log(("vmrun: Guest intercept -> VMexit\n"));
+        Log(("vmrun: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_VMMCALL, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
@@ -5950 +5967 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_VMLOAD))
     {
-        Log(("vmload: Guest intercept -> VMexit\n"));
+        Log(("vmload: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_VMLOAD, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
@@ -6001 +6018 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_VMSAVE))
     {
-        Log(("vmsave: Guest intercept -> VMexit\n"));
+        Log(("vmsave: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_VMSAVE, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
@@ -6052 +6069 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_CLGI))
     {
-        Log(("clgi: Guest intercept -> VMexit\n"));
+        Log(("clgi: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_CLGI, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
@@ -6073 +6090 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_STGI))
     {
-        Log2(("stgi: Guest intercept -> VMexit\n"));
+        Log2(("stgi: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_STGI, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }
@@ -6094 +6111 @@
     if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_INVLPGA))
     {
-        Log2(("invlpga: Guest intercept -> VMexit\n"));
+        Log2(("invlpga: Guest intercept -> #VMEXIT\n"));
         return HMSvmNstGstVmExit(pVCpu, pCtx, SVM_EXIT_INVLPGA, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
     }