Changeset 74603 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

Timestamp:

Oct 4, 2018 6:07:20 AM (7 years ago)

Author:

vboxsync

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

125486

Message:

VMM/IEM, HM: Nested VMX: bugref:9180 VM-exit bits; LMSW intercept. Separated VINF_HM_INTERCEPT_NOT_ACTIVE into VMX and SVM
specific codes. Adjusted IEMExecDecodedLmsw to supply the additional memory operand parameter from the VMCS guest-linear address
field.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (5 diffs)

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

@@ -5743 +5743 @@
  *
  * @param   u16NewMsw       The new value.
- */
-IEM_CIMPL_DEF_1(iemCImpl_lmsw, uint16_t, u16NewMsw)
+ * @param   GCPtrEffDst     The guest-linear address of the source operand in case
+ *                          of a memory operand. For register operand, pass
+ *                          NIL_RTGCPTR.
+ */
+IEM_CIMPL_DEF_2(iemCImpl_lmsw, uint16_t, u16NewMsw, RTGCPTR, GCPtrEffDst)
 {
     if (pVCpu->iem.s.uCpl != 0)
         return iemRaiseGeneralProtectionFault0(pVCpu);
     Assert(!pVCpu->cpum.GstCtx.eflags.Bits.u1VM);
+    IEM_CTX_ASSERT(pVCpu, CPUMCTX_EXTRN_CR0);
+
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+    /* Check nested-guest VMX intercept and get updated MSW if there's no VM-exit. */
+    if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
+    {
+        VBOXSTRICTRC rcStrict = iemVmxVmexitInstrLmsw(pVCpu, pVCpu->cpum.GstCtx.cr0, &u16NewMsw, GCPtrEffDst, cbInstr);
+        if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+            return rcStrict;
+    }
+#else
+    RT_NOREF_PV(GCPtrEffDst);
+#endif
 
     /*
      * Compose the new CR0 value and call common worker.
      */
-    IEM_CTX_ASSERT(pVCpu, CPUMCTX_EXTRN_CR0);
-    uint64_t uNewCr0 = pVCpu->cpum.GstCtx.cr0     & ~(X86_CR0_MP | X86_CR0_EM | X86_CR0_TS);
+    uint64_t uNewCr0 = pVCpu->cpum.GstCtx.cr0  & ~(X86_CR0_MP | X86_CR0_EM | X86_CR0_TS);
     uNewCr0 |= u16NewMsw & (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS);
     return IEM_CIMPL_CALL_4(iemCImpl_load_CrX, /*cr*/ 0, uNewCr0, IEMACCESSCRX_LMSW, UINT8_MAX /* iGReg */);
@@ -6370 +6385 @@
         if (rcStrict == VINF_SVM_VMEXIT)
             return VINF_SUCCESS;
-        if (rcStrict != VINF_HM_INTERCEPT_NOT_ACTIVE)
+        if (rcStrict != VINF_SVM_INTERCEPT_NOT_ACTIVE)
         {
             Log(("IEM: SVM intercepted rdmsr(%#x) failed. rc=%Rrc\n", pVCpu->cpum.GstCtx.ecx, VBOXSTRICTRC_VAL(rcStrict)));
@@ -6446 +6461 @@
         if (rcStrict == VINF_SVM_VMEXIT)
             return VINF_SUCCESS;
-        if (rcStrict != VINF_HM_INTERCEPT_NOT_ACTIVE)
+        if (rcStrict != VINF_SVM_INTERCEPT_NOT_ACTIVE)
         {
             Log(("IEM: SVM intercepted rdmsr(%#x) failed. rc=%Rrc\n", pVCpu->cpum.GstCtx.ecx, VBOXSTRICTRC_VAL(rcStrict)));
@@ -6526 +6541 @@
         if (rcStrict == VINF_SVM_VMEXIT)
             return VINF_SUCCESS;
-        if (rcStrict != VINF_HM_INTERCEPT_NOT_ACTIVE)
+        if (rcStrict != VINF_SVM_INTERCEPT_NOT_ACTIVE)
         {
             Log(("iemCImpl_in: iemSvmHandleIOIntercept failed (u16Port=%#x, cbReg=%u) rc=%Rrc\n", u16Port, cbReg,
@@ -6619 +6634 @@
         if (rcStrict == VINF_SVM_VMEXIT)
             return VINF_SUCCESS;
-        if (rcStrict != VINF_HM_INTERCEPT_NOT_ACTIVE)
+        if (rcStrict != VINF_SVM_INTERCEPT_NOT_ACTIVE)
         {
             Log(("iemCImpl_out: iemSvmHandleIOIntercept failed (u16Port=%#x, cbReg=%u) rc=%Rrc\n", u16Port, cbReg,