Changeset 92338 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 10, 2021 6:53:45 PM (3 years ago)

Author:

vboxsync

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

148188

Message:

VMM/NEMR3Native-darwin.cpp: Implement NEMHCQueryCpuTick() and NEMHCResumeCpuTickOnAll() and some updates for the APIC related state, bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -411 +411 @@
 }
 
-#if 0 /* unused */
 DECLINLINE(int) nemR3DarwinMsrRead(PVMCPUCC pVCpu, uint32_t idMsr, uint64_t *pu64Val)
 {
@@ -421 +420 @@
 }
 
-
+#if 0 /*unused*/
 DECLINLINE(int) nemR3DarwinMsrWrite(PVMCPUCC pVCpu, uint32_t idMsr, uint64_t u64Val)
 {
@@ -431 +430 @@
 }
 #endif
-
 
 static int nemR3DarwinCopyStateFromHv(PVMCC pVM, PVMCPUCC pVCpu, uint64_t fWhat)
@@ -1278 +1276 @@
     if (fWhat & CPUMCTX_EXTRN_OTHER_MSRS)
     {
-#if 0
-        hv_return_t hrc = hv_vmx_vcpu_set_apic_address(pVCpu->nem.s.hVCpuId, APICGetBaseMsrNoCheck(pVCpu));
+        hv_return_t hrc = hv_vmx_vcpu_set_apic_address(pVCpu->nem.s.hVCpuId, APICGetBaseMsrNoCheck(pVCpu) & PAGE_BASE_GC_MASK);
         if (RT_UNLIKELY(hrc != HV_SUCCESS))
             return nemR3DarwinHvSts2Rc(hrc);
-#endif
 
 #if 0
@@ -1692 +1688 @@
 static int nemR3DarwinVmxSetupVmcsProcCtls(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
 {
-    //PVMCC pVM = pVCpu->CTX_SUFF(pVM);
+    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     uint32_t       fVal = g_HmMsrs.u.vmx.ProcCtls.n.allowed0;     /* Bits set here must be set in the VMCS. */
     uint32_t const fZap = g_HmMsrs.u.vmx.ProcCtls.n.allowed1;     /* Bits cleared here must be cleared in the VMCS. */
@@ -1712 +1708 @@
     }
 
-#if 0 /** @todo */
     /* Use TPR shadowing if supported by the CPU. */
     if (   PDMHasApic(pVM)
@@ -1721 +1716 @@
         Assert(!(fVal & VMX_PROC_CTLS_CR8_STORE_EXIT));
         Assert(!(fVal & VMX_PROC_CTLS_CR8_LOAD_EXIT));
-        hmR0VmxSetupVmcsVirtApicAddr(pVmcsInfo);
     }
     else
-#endif
     {
         fVal |= VMX_PROC_CTLS_CR8_STORE_EXIT             /* CR8 reads cause a VM-exit. */
@@ -2195 +2188 @@
         }
 
-        /** @todo Only copy the state selectively. */
-        {
-            int rc = nemR3DarwinCopyStateToHv(pVM, pVCpu, &VmxTransient);
-            AssertRCReturn(rc, rc);
-        }
+        int rc = nemR3DarwinExportGuestState(pVM, pVCpu, &VmxTransient);
+        AssertRCReturn(rc, rc);
 
         /*
@@ -2712 +2702 @@
     STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatQueryCpuTick);
 
-    RT_NOREF(pVCpu, pcTicks, puAux);
-    return VINF_SUCCESS;
+    int rc = nemR3DarwinMsrRead(pVCpu, MSR_IA32_TSC, pcTicks);
+    if (   RT_SUCCESS(rc)
+        && puAux)
+    {
+        if (pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_TSC_AUX)
+        {
+            /** @todo Why the heck is puAux a uint32_t?. */
+            uint64_t u64Aux;
+            rc = nemR3DarwinMsrRead(pVCpu, MSR_K8_TSC_AUX, &u64Aux);
+            if (RT_SUCCESS(rc))
+                *puAux = (uint32_t)u64Aux;
+        }
+        else
+            *puAux = CPUMGetGuestTscAux(pVCpu);
+    }
+
+    return rc;
 }
 
@@ -2733 +2738 @@
     AssertReturn(VM_IS_NEM_ENABLED(pVM), VERR_NEM_IPE_9);
 
-    RT_NOREF(uPausedTscValue);
-    return VINF_SUCCESS;
+    hv_return_t hrc = hv_vm_sync_tsc(uPausedTscValue);
+    if (RT_LIKELY(hrc == HV_SUCCESS))
+        return VINF_SUCCESS;
+
+    return nemR3DarwinHvSts2Rc(hrc);
 }