Changeset 52411 in vbox

Timestamp:

Aug 19, 2014 11:00:46 AM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Use unordered atomics for VMMRZCallRing3[Enable|Disable]() and some VT-x nits.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (11 diffs)
• VMMRZ/VMMRZ.cpp (modified) (3 diffs)

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

@@ -2351 +2351 @@
     AssertRCReturn(rc, rc);
 
-    /* Update VCPU with the currently set pin-based VM-execution controls. */
     pVCpu->hm.s.vmx.u32PinCtls = val;
     return rc;
@@ -2475 +2474 @@
     AssertRCReturn(rc, rc);
 
-    /* Update VCPU with the currently set processor-based VM-execution controls. */
     pVCpu->hm.s.vmx.u32ProcCtls = val;
 
@@ -2534 +2532 @@
         AssertRCReturn(rc, rc);
 
-        /* Update VCPU with the currently set secondary processor-based VM-execution controls. */
         pVCpu->hm.s.vmx.u32ProcCtls2 = val;
     }
@@ -2719 +2716 @@
     /*
      * Without UnrestrictedGuest, pRealModeTSS and pNonPagingModeEPTPageTable *must* always be allocated.
-     * We no longer support the highly unlikely case of UnrestrictedGuest without pRealModeTSS. See hmR3InitFinalizeR0().
+     * We no longer support the highly unlikely case of UnrestrictedGuest without pRealModeTSS. See hmR3InitFinalizeR0Intel().
      */
-    /* -XXX- change hmR3InitFinalizeR0Intel() to fail if pRealModeTSS alloc fails. */
     if (   !pVM->hm.s.vmx.fUnrestrictedGuest
         &&  (   !pVM->hm.s.vmx.pNonPagingModeEPTPageTable
@@ -3336 +3332 @@
         AssertRCReturn(rc, rc);
 
-        /* Update VCPU with the currently set VM-exit controls. */
         pVCpu->hm.s.vmx.u32EntryCtls = val;
         HMCPU_CF_CLEAR(pVCpu, HM_CHANGED_VMX_ENTRY_CTLS);
@@ -3423 +3418 @@
         AssertRCReturn(rc, rc);
 
-        /* Update VCPU with the currently set VM-exit controls. */
         pVCpu->hm.s.vmx.u32ExitCtls = val;
         HMCPU_CF_CLEAR(pVCpu, HM_CHANGED_VMX_EXIT_CTLS);
@@ -7985 +7979 @@
     Log4Func(("vcpu[%d]\n", pVCpu->idCpu));
 
-    /* Clear interrupt-window exiting control. */
     if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_INT_WINDOW_EXIT)
     {
@@ -7992 +7985 @@
     }
 
-    /* Clear NMI-window exiting control. */
     if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT)
     {
@@ -8009 +8001 @@
 #endif
 
-    /* Clear the entry-interruption field (including the valid bit). */
     rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, 0);
     AssertRC(rc);
 
-    /* Clear the pending debug exception field. */
     rc = VMXWriteVmcs32(VMX_VMCS_GUEST_PENDING_DEBUG_EXCEPTIONS, 0);
     AssertRC(rc);
@@ -8233 +8223 @@
     HMVMX_ASSERT_PREEMPT_SAFE();
 
-#ifdef LOG_ENABLED
-    /** @todo r=ramshankar: I'm not able to use VMMRZCallRing3Disable() here,
-     *        probably not initialized yet? Anyway this will do for now.
-     *
-     *  Update: Should be possible once VMXR0LoadGuestState() is removed as an
-     *  interface and disable ring-3 calls when thread-context hooks are not
-     *  available. */
-    bool fCallerDisabledLogFlush = VMMR0IsLogFlushDisabled(pVCpu);
-    VMMR0LogFlushDisable(pVCpu);
-#endif
+    VMMRZCallRing3Disable(pVCpu);
+    Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
@@ -8300 +8282 @@
     HMCPU_CF_CLEAR(pVCpu, HM_CHANGED_GUEST_CR2);
 
-#ifdef LOG_ENABLED
-    /* Only reenable log-flushing if the caller has it enabled. */
-    if (!fCallerDisabledLogFlush)
-        VMMR0LogFlushEnable(pVCpu);
-#endif
+    VMMRZCallRing3Enable(pVCpu);
 
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatLoadGuestState, x);

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -134 +134 @@
 
     Assert(pVCpu->vmm.s.cCallRing3Disabled < 16);
-    if (ASMAtomicIncU32(&pVCpu->vmm.s.cCallRing3Disabled) == 1) /** @todo replace with unordered variant (ASMAtomicUoIncU32). */
-    {                                                           /** @todo See @bugref{6208} comment #36 for impl. diff. */
+    if (ASMAtomicUoIncU32(&pVCpu->vmm.s.cCallRing3Disabled) == 1)
+    {
         /** @todo it might make more sense to just disable logging here, then we
          * won't flush away important bits... but that goes both ways really. */
@@ -155 +155 @@
 
 /**
- * Counters VMMRZCallRing3Disable and re-enables host calls.
+ * Counters VMMRZCallRing3Disable() and re-enables host calls.
  *
  * @param   pVCpu               The CPU struct for the calling EMT.
@@ -168 +168 @@
 
     Assert(pVCpu->vmm.s.cCallRing3Disabled > 0);
-    if (ASMAtomicDecU32(&pVCpu->vmm.s.cCallRing3Disabled) == 0) /** @todo replace with unordered variant (ASMAtomicUoDecU32). */
+    if (ASMAtomicUoDecU32(&pVCpu->vmm.s.cCallRing3Disabled) == 0)
     {
 #ifdef IN_RC