Changeset 102852 in vbox for trunk/src

Timestamp:

Jan 12, 2024 9:39:18 AM (13 months ago)

Author:

vboxsync

Message:

VMM/VMXAllTemplate: Nested VMX: bugref:10318 Trying to narrow down the reason for the VM proc ctls assertion.

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -1039 +1039 @@
         pVmcsInfoFrom = &pVCpu->hmr0.s.vmx.VmcsInfo;
         pVmcsInfoTo   = &pVCpu->hmr0.s.vmx.VmcsInfoNstGst;
+        Assert(!pVCpu->hm.s.vmx.fMergedNstGstCtls);
     }
     else
@@ -1428 +1429 @@
                         VERR_VMX_VMCS_FIELD_CACHE_INVALID);
 
-    rc = VMX_VMCS_READ_64(pVCpu, VMX_VMCS64_CTRL_TSC_OFFSET_FULL, &u64Val);
-    AssertRC(rc);
-    AssertMsgReturnStmt(pVmcsInfo->u64TscOffset == u64Val,
-                        ("%s TSC offset mismatch: Cache=%#RX64 VMCS=%#RX64\n", pcszVmcs, pVmcsInfo->u64TscOffset, u64Val),
-                        VCPU_2_VMXSTATE(pVCpu).u32HMError = VMX_VCI_CTRL_TSC_OFFSET,
-                        VERR_VMX_VMCS_FIELD_CACHE_INVALID);
+    /*
+     * The TSC offset will only be used when RDTSC is not intercepted.
+     * Since we don't actively clear it while switching between intercepting or not,
+     * the value here could be stale.
+     */
+    if (!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_RDTSC_EXIT))
+    {
+        rc = VMX_VMCS_READ_64(pVCpu, VMX_VMCS64_CTRL_TSC_OFFSET_FULL, &u64Val);
+        AssertRC(rc);
+        AssertMsgReturnStmt(pVmcsInfo->u64TscOffset == u64Val,
+                            ("%s TSC offset mismatch: Cache=%#RX64 VMCS=%#RX64\n", pcszVmcs, pVmcsInfo->u64TscOffset, u64Val),
+                            VCPU_2_VMXSTATE(pVCpu).u32HMError = VMX_VCI_CTRL_TSC_OFFSET,
+                            VERR_VMX_VMCS_FIELD_CACHE_INVALID);
+    }
 
     NOREF(pcszVmcs);
@@ -7767 +7776 @@
     /* Indicate that we no longer need to VM-exit when the guest is ready to receive interrupts, it is now ready. */
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
+    Assert(!pVmxTransient->fIsNestedGuest);
     vmxHCClearIntWindowExitVmcs(pVCpu, pVmcsInfo);