Changeset 102020 in vbox for trunk

Timestamp:

Nov 9, 2023 11:27:42 AM (16 months ago)

Author:

vboxsync

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

160120

Message:

VMM: Nested VMX: bugref:10318 Discard unused VMCS launch-state bits and update 'VMCLEAR' VMCS launch-state bit to be 0.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• include/VBox/vmm/hmvmxinline.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3816 +3816 @@
 /** @name VMX_V_VMCS_STATE_XXX - Virtual VMCS launch state.
  * @{ */
+/** VMCS launch state clear legacy value -- deprecated!!!. */
+#define VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY                    RT_BIT(0)
 /** VMCS launch state clear. */
-#define VMX_V_VMCS_LAUNCH_STATE_CLEAR                           RT_BIT(0)
-/** VMCS launch state active. */
-#define VMX_V_VMCS_LAUNCH_STATE_ACTIVE                          RT_BIT(1)
-/** VMCS launch state current. */
-#define VMX_V_VMCS_LAUNCH_STATE_CURRENT                         RT_BIT(2)
+#define VMX_V_VMCS_LAUNCH_STATE_CLEAR                           (0)
+/* Bit 1 used to be "active", no longer used. */
+/* Bit 2 used to be "current", no longer used. */
 /** VMCS launch state launched. */
 #define VMX_V_VMCS_LAUNCH_STATE_LAUNCHED                        RT_BIT(3)
-/** The mask of valid VMCS launch states. */
-#define VMX_V_VMCS_LAUNCH_STATE_MASK                            (  VMX_V_VMCS_LAUNCH_STATE_CLEAR \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_ACTIVE \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_CURRENT \
-                                                                 | VMX_V_VMCS_LAUNCH_STATE_LAUNCHED)
 /** @} */
 

trunk/include/VBox/vmm/hmvmxinline.h

@@ -289 +289 @@
     switch (fVmcsState)
     {
-        case VMX_V_VMCS_LAUNCH_STATE_CLEAR:     return "Clear";
-        case VMX_V_VMCS_LAUNCH_STATE_LAUNCHED:  return "Launched";
-        default:                                return "Unknown";
+        case VMX_V_VMCS_LAUNCH_STATE_CLEAR:            return "Clear";
+        case VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY:     return "Clear (Legacy(";
+        case VMX_V_VMCS_LAUNCH_STATE_LAUNCHED:         return "Launched";
+        default:                                       return "Unknown";
     }
 }

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

@@ -2449 +2449 @@
             Assert(VMXINSTRID_IS_VALID(uInstrId));
             Assert(VMXINSTRID_GET_ID(uInstrId) == (uInstrId & 0x3));
+            Assert(GCPtrDisp == 0);
             Assert(ExitInstrInfo.RdrandRdseed.u2OperandSize != 3);
             ExitInstrInfo.RdrandRdseed.u3Undef0  = 0;
@@ -7822 +7823 @@
 
     /* Current VMCS is not a shadow VMCS. */
-    if (!pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.u32VmcsRevId.n.fIsShadowVmcs)
+    PVMXVVMCS pVmcs = &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs;
+    if (!pVmcs->u32VmcsRevId.n.fIsShadowVmcs)
     { /* likely */ }
     else
@@ -7847 +7849 @@
     {
         /* VMLAUNCH with non-clear VMCS. */
-        if (pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState == VMX_V_VMCS_LAUNCH_STATE_CLEAR)
+        if (pVmcs->fVmcsState == VMX_V_VMCS_LAUNCH_STATE_CLEAR)
         { /* likely */ }
+        else if (pVmcs->fVmcsState == VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY)
+        {
+            /* Convert legacy launch-state value to current value, see @bugref{10318#c114} for reasons.*/
+            pVmcs->fVmcsState = VMX_V_VMCS_LAUNCH_STATE_CLEAR;
+            Log(("vmlaunch: Updated legacy 'VMCLEAR' VMCS launch-state bit to current\n"));
+        }
         else
         {
-            Log(("vmlaunch: VMLAUNCH with non-clear VMCS -> VMFail\n"));
+            Log(("vmlaunch: VMLAUNCH with non-clear VMCS %RGp -> VMFail\n", pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs));
             pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = kVmxVDiag_Vmentry_VmcsClear;
             iemVmxVmFail(pVCpu, VMXINSTRERR_VMLAUNCH_NON_CLEAR_VMCS);
@@ -7860 +7868 @@
     {
         /* VMRESUME with non-launched VMCS. */
-        if (pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState == VMX_V_VMCS_LAUNCH_STATE_LAUNCHED)
+        if (pVmcs->fVmcsState == VMX_V_VMCS_LAUNCH_STATE_LAUNCHED)
         { /* likely */ }
         else
@@ -7903 +7911 @@
              */
             iemVmxVmentrySaveNmiBlockingFF(pVCpu);
-
-            PVMXVVMCS pVmcs = &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs;
-            Assert(pVmcs);
 
             rc = iemVmxVmentryCheckGuestState(pVCpu, pszInstr);
@@ -8997 +9002 @@
             if (VM_IS_HM_ENABLED(pVCpu->CTX_SUFF(pVM)))
                 HMNotifyVmxNstGstCurrentVmcsChanged(pVCpu);
+
+            /* Convert legacy launch-state value to current value, see @bugref{10318#c114} for reasons.*/
+            if (pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState == VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY)
+            {
+                pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState = VMX_V_VMCS_LAUNCH_STATE_CLEAR;
+                Log(("vmptrld: Updated legacy 'VMCLEAR' VMCS launch-state bit to current\n"));
+            }
         }
         else
@@ -9005 +9017 @@
             return rc;
         }
+    }
+    else if (   IEM_VMX_HAS_CURRENT_VMCS(pVCpu)
+             && pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState == VMX_V_VMCS_LAUNCH_STATE_CLEAR_LEGACY)
+    {
+        /* Convert legacy launch-state value to current value, see @bugref{10318#c114} for reasons.*/
+        pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.fVmcsState = VMX_V_VMCS_LAUNCH_STATE_CLEAR;
+        Log(("vmptrld: Updated legacy VMCLEAR launch-state bit to current\n"));
     }
 

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

@@ -934 +934 @@
     Assert(pVmcsInfo->HCPhysShadowVmcs != 0 && pVmcsInfo->HCPhysShadowVmcs != NIL_RTHCPHYS);
 
-    int rc = VMXLoadVmcs(pVmcsInfo->HCPhysShadowVmcs);
-    if (RT_SUCCESS(rc))
-        pVmcsInfo->fShadowVmcsState |= VMX_V_VMCS_LAUNCH_STATE_CURRENT;
-    return rc;
+    return VMXLoadVmcs(pVmcsInfo->HCPhysShadowVmcs);
 }
 

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

@@ -285 +285 @@
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
-    int rc = VMXLoadVmcs(pVmcsInfo->HCPhysVmcs);
-    if (RT_SUCCESS(rc))
-        pVmcsInfo->fVmcsState |= VMX_V_VMCS_LAUNCH_STATE_CURRENT;
-    return rc;
+    return VMXLoadVmcs(pVmcsInfo->HCPhysVmcs);
 }
 
@@ -3013 +3010 @@
         }
         else
-            LogRelFunc(("Failed to load the %s. rc=%Rrc\n", rc, pszVmcs));
+            LogRelFunc(("Failed to load the %s. rc=%Rrc\n", pszVmcs, rc));
     }
     else