Changeset 2934 in vbox

Timestamp:

May 30, 2007 3:46:43 PM (18 years ago)

Author:

vboxsync

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

21614

Message:

Initial code for proper tsc offset or rdtsc emulation. Needs testing.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (4 diffs)

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

@@ -469 +469 @@
 
     /** TSC offset. */
-    /** @todo use host tsc if safe, other intercept rdtsc */
-    pVMCB->ctrl.u64TSCOffset = TMCpuTickGetOffset(pVM);
+    if (TMCpuTickCanUseRealTSC(pVM, &pVMCB->ctrl.u64TSCOffset))
+        pVMCB->ctrl.u32InterceptCtrl1 &= ~SVM_CTRL1_INTERCEPT_RDTSC;
+    else
+        pVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_RDTSC;
 
     /** @todo 64 bits stuff (?):

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

@@ -336 +336 @@
         {
             Log2(("Enable irq window exit!\n"));
-            rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT);
+            pVM->hwaccm.s.vmx.proc_ctls |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT;
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls);
             AssertRC(rc);
         }
@@ -597 +598 @@
 
         /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
-        /* @todo use fake TSS here */
-        //if (!(pCtx->cr0 & X86_CR0_PROTECTION_ENABLE))
-
-        rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         pCtx->trHid.u32Limit);
-        rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          pCtx->trHid.u32Base);
+        if (!(pCtx->cr0 & X86_CR0_PROTECTION_ENABLE))
+        {
+            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         sizeof(*pVM->hwaccm.s.vmx.pRealModeTSS));
+            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          0);
+        }
+        else
+        {
+            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         pCtx->trHid.u32Limit);
+            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          pCtx->trHid.u32Base);
+        }
         val = pCtx->trHid.Attr.u;
 
@@ -793 +799 @@
 
     /** TSC offset. */
-    /** @todo use host tsc if safe, other intercept rdtsc */
-    uint64_t u64TSCOffset = TMCpuTickGetOffset(pVM);
-
+    uint64_t u64TSCOffset;
+
+    if (TMCpuTickCanUseRealTSC(pVM, &u64TSCOffset))
+    {
+        /** @todo does VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT take precedence over TSC_OFFSET? */
 #if HC_ARCH_BITS == 64
-    rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_FULL, u64TSCOffset);
+        rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_FULL, u64TSCOffset);
 #else
-    rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_FULL, (uint32_t)u64TSCOffset);
-    rc |= VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_HIGH, (uint32_t)(u64TSCOffset >> 32ULL));
-#endif
-    AssertRC(rc);
+        rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_FULL, (uint32_t)u64TSCOffset);
+        rc |= VMXWriteVMCS(VMX_VMCS_CTRL_TSC_OFFSET_HIGH, (uint32_t)(u64TSCOffset >> 32ULL));
+#endif
+        AssertRC(rc);
+
+        pVM->hwaccm.s.vmx.proc_ctls &= ~VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT;
+        rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls);
+        AssertRC(rc);
+    }
+    else
+    {
+        pVM->hwaccm.s.vmx.proc_ctls |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT;
+        rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls);
+        AssertRC(rc);
+    }
 
     /* Done. */
@@ -1462 +1481 @@
         /* Clear VM-exit on IF=1 change. */
         Log2(("VMX_EXIT_IRQ_WINDOW %VGv\n", pCtx->eip));
+        pVM->hwaccm.s.vmx.proc_ctls &= ~VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT;
         rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVM->hwaccm.s.vmx.proc_ctls);
         AssertRC(rc);