Changeset 56791 in vbox

Timestamp:

Jul 3, 2015 4:19:59 PM (10 years ago)

Author:

vboxsync

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

101441

Message:

VMM/GIM: Try passing identical TSC and NanoTS pairs to all VCPUs for KVM guests.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GIMAllKvm.cpp (modified) (5 diffs)
• VMMR0/GIMR0.cpp (modified) (2 diffs)
• VMMR0/GIMR0Kvm.cpp (added)
• VMMR3/GIMKvm.cpp (modified) (6 diffs)
• include/GIMKvmInternal.h (modified) (4 diffs)

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

@@ -35 +35 @@
 
 #include <iprt/asm-amd64-x86.h>
+#include <iprt/time.h>
 
 
@@ -226 +227 @@
             bool fEnable = RT_BOOL(uRawValue & MSR_GIM_KVM_SYSTEM_TIME_ENABLE_BIT);
 #ifndef IN_RING3
+# ifdef IN_RING0
+            gimR0KvmUpdateSystemTime(pVM, pVCpu);
+# else
+            Assert(pVM->cCpus == 1);
             if (fEnable)
             {
-                RTCCUINTREG fEFlags  = ASMIntDisableFlags();
-                pKvmCpu->uTsc        = TMCpuTickGetNoCheck(pVCpu);
-                pKvmCpu->uVirtNanoTS = TMVirtualGetNoCheck(pVM);
+                RTCCUINTREG fEFlags = ASMIntDisableFlags();
+                pKvmCpu->uTsc        = TMCpuTickGetNoCheck(pVCpu) | UINT64_C(1);
+                pKvmCpu->uVirtNanoTS = TMVirtualGetNoCheck(pVM)   | UINT64_C(1);
                 ASMSetFlags(fEFlags);
             }
+# endif
             return VINF_CPUM_R3_MSR_WRITE;
 #else
@@ -251 +257 @@
                 int rc2 = PGMPhysSimpleReadGCPhys(pVM, &SystemTime, pKvmCpu->GCPhysSystemTime, sizeof(GIMKVMSYSTEMTIME));
                 if (RT_SUCCESS(rc2))
-                    fFlags = (SystemTime.fFlags & GIM_KVM_SYSTEM_TIME_FLAGS_GUEST_PAUSED);
+                    pKvmCpu->fSystemTimeFlags = (SystemTime.fFlags & GIM_KVM_SYSTEM_TIME_FLAGS_GUEST_PAUSED);
             }
 
@@ -258 +264 @@
             pKvmCpu->GCPhysSystemTime      = MSR_GIM_KVM_SYSTEM_TIME_GUEST_GPA(uRawValue);
             pKvmCpu->u32SystemTimeVersion += 2;
-            int rc = gimR3KvmEnableSystemTime(pVM, pVCpu, pKvmCpu, fFlags);
+            int rc = gimR3KvmEnableSystemTime(pVM, pVCpu);
             if (RT_FAILURE(rc))
             {
@@ -282 +288 @@
                 if (RT_SUCCESS(rc))
                 {
-                    pKvm->u64WallClockMsr     = uRawValue;
+                    pKvm->u64WallClockMsr = uRawValue;
                     return VINF_SUCCESS;
                 }

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

@@ -43 +43 @@
             return gimR0HvInitVM(pVM);
 
+        case GIMPROVIDERID_KVM:
+            return gimR0KvmInitVM(pVM);
+
         default:
             break;
@@ -65 +68 @@
         case GIMPROVIDERID_HYPERV:
             return gimR0HvTermVM(pVM);
+
+        case GIMPROVIDERID_KVM:
+            return gimR0KvmTermVM(pVM);
 
         default:

trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp

@@ -358 +358 @@
         SSMR3GetGCPhys(pSSM, &pKvmCpu->GCPhysSystemTime);
         SSMR3GetU32(pSSM, &pKvmCpu->u32SystemTimeVersion);
-        rc = SSMR3GetU8(pSSM, &fSystemTimeFlags);
+        rc = SSMR3GetU8(pSSM, &pKvmCpu->fSystemTimeFlags);
         AssertRCReturn(rc, rc);
 
         /* Enable the system-time struct. if necessary. */
+        /** @todo update guest struct only if cTscTicksPerSecond doesn't match host
+         *        anymore. */
         if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pKvmCpu->u64SystemTimeMsr))
         {
             Assert(!TMVirtualIsTicking(pVM));       /* paranoia. */
             Assert(!TMCpuTickIsTicking(pVCpu));
-            rc = gimR3KvmEnableSystemTime(pVM, pVCpu, pKvmCpu, fSystemTimeFlags);
+            rc = gimR3KvmEnableSystemTime(pVM, pVCpu);
             AssertRCReturn(rc, rc);
         }
@@ -388 +390 @@
  * @param   pVM                Pointer to the VM.
  * @param   pVCpu              Pointer to the VMCPU.
- * @param   pKvmCpu            Pointer to the GIMKVMCPU with all fields
- *                             populated by the caller.
- * @param   fFlags             The system-time struct. flags.
  *
  * @remarks Don't do any release assertions here, these can be triggered by
  *          guest R0 code.
  */
-VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu, PGIMKVMCPU pKvmCpu, uint8_t fFlags)
-{
+VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu)
+{
+    PGIMKVM    pKvm    = &pVM->gim.s.u.Kvm;
+    PGIMKVMCPU pKvmCpu = &pVCpu->gim.s.u.KvmCpu;
+
     /*
      * Validate the mapping address first.
@@ -407 +409 @@
     }
 
+    /*
+     * Construct the system-time struct.
+     */
     GIMKVMSYSTEMTIME SystemTime;
     RT_ZERO(SystemTime);
@@ -412 +417 @@
     SystemTime.u64NanoTS   = pKvmCpu->uVirtNanoTS;
     SystemTime.u64Tsc      = pKvmCpu->uTsc;
-    SystemTime.fFlags      = fFlags | GIM_KVM_SYSTEM_TIME_FLAGS_TSC_STABLE;
+    SystemTime.fFlags      = pKvmCpu->fSystemTimeFlags | GIM_KVM_SYSTEM_TIME_FLAGS_TSC_STABLE;
 
     /*
@@ -424 +429 @@
      * time = ((tsc * SysTime.u32TscScale) >> 32) + SysTime.u64NanoTS
      */
-    PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
     uint64_t u64TscFreq   = pKvm->cTscTicksPerSecond;
     SystemTime.i8TscShift = 0;
@@ -440 +444 @@
     SystemTime.u32TscScale = ASMDivU64ByU32RetU32(RT_NS_1SEC_64 << 32, uTscFreqLo);
 
+    /*
+     * Update guest memory with the system-time struct.
+     */
     Assert(!(SystemTime.u32Version & UINT32_C(1)));
     int rc = PGMPhysSimpleWriteGCPhys(pVM, pKvmCpu->GCPhysSystemTime, &SystemTime, sizeof(GIMKVMSYSTEMTIME));

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

@@ -203 +203 @@
     /** The TSC frequency (in HZ) reported to the guest. */
     uint64_t                    cTscTicksPerSecond;
+    /** Ring-0 mutex. */
+    RTSEMFASTMUTEX              hFastMtx;
 } GIMKVM;
 /** Pointer to per-VM GIM KVM instance data. */
@@ -225 +227 @@
     /** The guest virtual time while enabling the system-time MSR. */
     uint64_t                    uVirtNanoTS;
+    /** The flags of the system-time struct. */
+    uint8_t                     fSystemTimeFlags;
 } GIMKVMCPU;
 /** Pointer to per-VCPU GIM KVM instance data. */
@@ -235 +239 @@
 
 #ifdef IN_RING0
-#if 0
 VMMR0_INT_DECL(int)             gimR0KvmInitVM(PVM pVM);
 VMMR0_INT_DECL(int)             gimR0KvmTermVM(PVM pVM);
-VMMR0_INT_DECL(int)             gimR0KvmUpdateParavirtTsc(PVM pVM, uint64_t u64Offset);
-#endif
+VMMR0_INT_DECL(int)             gimR0KvmUpdateSystemTime(PVM pVM, PVMCPU pVCpu);
 #endif /* IN_RING0 */
 
@@ -252 +254 @@
 
 VMMR3_INT_DECL(int)             gimR3KvmDisableSystemTime(PVM pVM);
-VMMR3_INT_DECL(int)             gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu, PGIMKVMCPU pKvmCpu, uint8_t fFlags);
+VMMR3_INT_DECL(int)             gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu);
 VMMR3_INT_DECL(int)             gimR3KvmEnableWallClock(PVM pVM, RTGCPHYS GCPhysSysTime);
 #endif /* IN_RING3 */