Changeset 97149 in vbox

Timestamp:

Oct 14, 2022 7:11:00 AM (2 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:10092 The virtual-APIC page is programmed while merging the nested-guest VMCS. If TPR shadowing is disabled, also update the virtual-APIC page address in the VMCS or when enabled, only write if the address changed.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -916 +916 @@
         else
         {
-            pVmcsInfo->pbVirtApic     = &pVCpu->cpum.GstCtx.hwvirt.vmx.abVirtApicPage[0];
-            pVmcsInfo->HCPhysVirtApic = GVMMR0ConvertGVMPtr2HCPhys(pVM, pVmcsInfo->pbVirtApic);
-            Assert(pVmcsInfo->HCPhysVirtApic && pVmcsInfo->HCPhysVirtApic != NIL_RTHCPHYS);
+            /* These are setup later while marging the nested-guest VMCS. */
+            Assert(pVmcsInfo->pbVirtApic == NULL);
+            Assert(pVmcsInfo->HCPhysVirtApic == NIL_RTHCPHYS);
         }
     }
@@ -5716 +5716 @@
         rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_PLE_WINDOW, cPleWindowTicks);
     }
-    if (u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
-    {
-        rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_TPR_THRESHOLD, u32TprThreshold);
+    if (pVmcsInfoNstGst->HCPhysVirtApic != HCPhysVirtApic)
         rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_VIRT_APIC_PAGEADDR_FULL, HCPhysVirtApic);
-    }
+    rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_TPR_THRESHOLD, u32TprThreshold);
     if (u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
         rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_APIC_ACCESSADDR_FULL, HCPhysApicAccess);