Changeset 72636 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 21, 2018 10:47:43 AM (7 years ago)

Author:

vboxsync

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

123139

Message:

EM,HM: Removed EMInterpretRdtsc and EMInterpretRdtscp (reapplying r123092 backed out in r123118). Use VINF_IEM_RAISED_XCPT rather than VINF_EM_RESCHEDULE for clarity. bugref:6973

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (4 diffs)

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

@@ -6255 +6255 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     VBOXSTRICTRC rcStrict = IEMExecDecodedRdtsc(pVCpu, hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 2));
     if (rcStrict == VINF_SUCCESS)
         pSvmTransient->fUpdateTscOffsetting = true;
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
     HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
     return VBOXSTRICTRC_TODO(rcStrict);
-#else
-    int rc = EMInterpretRdtsc(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        pSvmTransient->fUpdateTscOffsetting = true;
-        hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 2);
-        HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
-    }
-    else
-    {
-        AssertMsgFailed(("hmR0SvmExitRdtsc: EMInterpretRdtsc failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
-    return rc;
-#endif
 }
 
@@ -6289 +6272 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     VBOXSTRICTRC rcStrict = IEMExecDecodedRdtscp(pVCpu, hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 3));
     if (rcStrict == VINF_SUCCESS)
         pSvmTransient->fUpdateTscOffsetting = true;
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
     HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
     return VBOXSTRICTRC_TODO(rcStrict);
-#else
-    int rc = EMInterpretRdtscp(pVCpu->CTX_SUFF(pVM), pVCpu, pCtx);
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        pSvmTransient->fUpdateTscOffsetting = true;
-        hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 3);
-        HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
-    }
-    else
-    {
-        AssertMsgFailed(("hmR0SvmExitRdtsc: EMInterpretRdtscp failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
-    return rc;
-#endif
 }
 

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

@@ -11917 +11917 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);      /* Needed for CPL < 0 only, really. */
     rc    |= hmR0VmxSaveGuestRegsForIemExec(pVCpu, pMixedCtx, false /*fMemory*/, false /*fNeedRsp*/);
@@ -11934 +11933 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
     return rcStrict;
-#else
-    int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);
-    AssertRCReturn(rc, rc);
-
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-    rc = EMInterpretRdtsc(pVM, pVCpu, CPUMCTX2CORE(pMixedCtx));
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        rc = hmR0VmxAdvanceGuestRip(pVCpu, pMixedCtx, pVmxTransient);
-        Assert(pVmxTransient->cbInstr == 2);
-        /* If we get a spurious VM-exit when offsetting is enabled, we must reset offsetting on VM-reentry. See @bugref{6634}. */
-        if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_USE_TSC_OFFSETTING)
-            pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = true;
-    }
-    else
-        rc = VERR_EM_INTERPRETER;
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
-    return rc;
-#endif
 }
 
@@ -11962 +11942 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);      /* Needed for CPL < 0 only, really. */
     rc    |= hmR0VmxSaveGuestRegsForIemExec(pVCpu, pMixedCtx, false /*fMemory*/, false /*fNeedRsp*/);
@@ -11980 +11959 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
     return rcStrict;
-#else
-    int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);
-    rc    |= hmR0VmxSaveGuestAutoLoadStoreMsrs(pVCpu, pMixedCtx);  /* For MSR_K8_TSC_AUX */
-    AssertRCReturn(rc, rc);
-
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-    rc = EMInterpretRdtscp(pVM, pVCpu, pMixedCtx);
-    if (RT_SUCCESS(rc))
-    {
-        rc  = hmR0VmxAdvanceGuestRip(pVCpu, pMixedCtx, pVmxTransient);
-        Assert(pVmxTransient->cbInstr == 3);
-        /* If we get a spurious VM-exit when offsetting is enabled, we must reset offsetting on VM-reentry. See @bugref{6634}. */
-        if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_USE_TSC_OFFSETTING)
-            pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = true;
-    }
-    else
-    {
-        AssertMsgFailed(("hmR0VmxExitRdtscp: EMInterpretRdtscp failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
-    return rc;
-#endif
 }