儲存庫 vbox 的更動 56813

時間撮記:

2015-7-6 上午11:03:52 (10 年 以前)

作者:

vboxsync

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

101464

訊息:

VMM/GIM: Fix regression introduced in r101441 (on hosts without threadctxhooks, we need to take spinlocks)

位置:

trunk/src/VBox/VMM

檔案:

• VMMAll/GIMAllKvm.cpp (修改) (4 筆差異)
• VMMR0/GIMR0Kvm.cpp (修改) (6 筆差異)
• include/GIMKvmInternal.h (修改) (2 筆差異)

trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp

@@ -226 +226 @@
         {
             bool fEnable = RT_BOOL(uRawValue & MSR_GIM_KVM_SYSTEM_TIME_ENABLE_BIT);
-#ifndef IN_RING3
-# ifdef IN_RING0
+#ifdef IN_RING0
             gimR0KvmUpdateSystemTime(pVM, pVCpu);
-# else
+            return VINF_CPUM_R3_MSR_WRITE;
+#elif defined(IN_RC)
             Assert(pVM->cCpus == 1);
             if (fEnable)
@@ -238 +238 @@
                 ASMSetFlags(fEFlags);
             }
-# endif
             return VINF_CPUM_R3_MSR_WRITE;
-#else
+#else /* IN_RING3 */
             if (!fEnable)
             {
@@ -271 +270 @@
             }
             return VINF_SUCCESS;
-#endif /* IN_RING3 */
+#endif
         }
 
@@ -278 +277 @@
         {
 #ifndef IN_RING3
-
             return VINF_CPUM_R3_MSR_WRITE;
 #else

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

@@ -28 +28 @@
 #include <VBox/vmm/vm.h>
 
-#include <iprt/semaphore.h>
+#include <iprt/spinlock.h>
 
 
@@ -46 +46 @@
     Assert(GIMIsEnabled(pVM));
     PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
-    AssertReturn(pKvm->hFastMtx != NIL_RTSEMFASTMUTEX, VERR_GIM_IPE_3);
+    AssertReturn(pKvm->hSpinlockR0 != NIL_RTSPINLOCK, VERR_GIM_IPE_3);
 
     /*
@@ -62 +62 @@
      * will be applied to the remaining.
      */
-    RTSemFastMutexRequest(pKvm->hFastMtx);
+    RTSpinlockAcquire(pKvm->hSpinlockR0);
     for (uint32_t i = 0; i < pVM->cCpus; i++)
     {
-        PGIMKVMCPU pKvmCpu   = &pVM->aCpus[i].gim.s.u.KvmCpu;
+        PGIMKVMCPU pKvmCpu = &pVM->aCpus[i].gim.s.u.KvmCpu;
         if (   !pKvmCpu->uTsc
             && !pKvmCpu->uVirtNanoTS)
@@ -73 +73 @@
         }
     }
-    RTSemFastMutexRelease(pKvm->hFastMtx);
+    RTSpinlockRelease(pKvm->hSpinlockR0);
 
     return VINF_SUCCESS;
@@ -91 +91 @@
 
     PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
-    Assert(pKvm->hFastMtx == NIL_RTSEMFASTMUTEX);
+    Assert(pKvm->hSpinlockR0 == NIL_RTSPINLOCK);
 
-    int rc = RTSemFastMutexCreate(&pKvm->hFastMtx);
+    int rc = RTSpinlockCreate(&pKvm->hSpinlockR0, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "KVM");
     return rc;
 }
@@ -110 +110 @@
 
     PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
-    RTSemFastMutexDestroy(pKvm->hFastMtx);
-    pKvm->hFastMtx = NIL_RTSEMFASTMUTEX;
+    RTSpinlockDestroy(pKvm->hSpinlockR0);
+    pKvm->hSpinlockR0 = NIL_RTSPINLOCK;
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/include/GIMKvmInternal.h

@@ -188 +188 @@
 
 /**
- * GIM KVMV VM instance data.
+ * GIM KVM VM instance data.
  * Changes to this must checked against the padding of the gim union in VM!
  */
@@ -203 +203 @@
     /** The TSC frequency (in HZ) reported to the guest. */
     uint64_t                    cTscTicksPerSecond;
-    /** Ring-0 mutex. */
-    RTSEMFASTMUTEX              hFastMtx;
+    /** Spinlock used for protecting GIMKVMCPU::uTsc and
+     *  GIMKVMCPU::uVirtNanoTS. */
+    RTSPINLOCK                  hSpinlockR0;
 } GIMKVM;
 /** Pointer to per-VM GIM KVM instance data. */