Changeset 93267 in vbox

Timestamp:

Jan 17, 2022 11:14:57 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 True VMX controls MSR support.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (6 diffs)

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

@@ -5998 +5998 @@
     PCVMXVVMCS const pVmcs = &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs;
     const char * const pszFailure = "VMFail";
+    bool const fVmxTrueMsrs       = RT_BOOL(pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.u64Basic & VMX_BF_BASIC_TRUE_CTLS_MASK);
 
     /*
@@ -6006 +6007 @@
         /* Pin-based VM-execution controls. */
         {
-            VMXCTLSMSR const PinCtls = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.PinCtls;
+            VMXCTLSMSR const PinCtls = fVmxTrueMsrs ? pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.TruePinCtls
+                                                    : pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.PinCtls;
             if (!(~pVmcs->u32PinCtls & PinCtls.n.allowed0))
             { /* likely */ }
@@ -6020 +6022 @@
         /* Processor-based VM-execution controls. */
         {
-            VMXCTLSMSR const ProcCtls = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.ProcCtls;
+            VMXCTLSMSR const ProcCtls = fVmxTrueMsrs ? pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.TrueProcCtls
+                                                     : pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.ProcCtls;
             if (!(~pVmcs->u32ProcCtls & ProcCtls.n.allowed0))
             { /* likely */ }
@@ -6206 +6209 @@
         Assert(!(pVmcs->u32PinCtls & VMX_PIN_CTLS_POSTED_INT));             /* We don't support posted interrupts yet. */
         Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_PML));                /* We don't support PML yet. */
-        Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_UNRESTRICTED_GUEST)); /* We don't support Unrestricted-guests yet. */
+#ifndef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+        Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_UNRESTRICTED_GUEST)); /* Support for Unrestricted-guests is conditional. */
+#endif
         Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_VMFUNC));             /* We don't support VM functions yet. */
         Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT_XCPT_VE));        /* We don't support EPT-violation #VE yet. */
@@ -6240 +6245 @@
      */
     {
-        VMXCTLSMSR const ExitCtls = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.ExitCtls;
+        VMXCTLSMSR const ExitCtls = fVmxTrueMsrs ? pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.TrueExitCtls
+                                                 : pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.ExitCtls;
         if (!(~pVmcs->u32ExitCtls & ExitCtls.n.allowed0))
         { /* likely */ }
@@ -6286 +6292 @@
      */
     {
-        VMXCTLSMSR const EntryCtls = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.EntryCtls;
+        VMXCTLSMSR const EntryCtls = fVmxTrueMsrs ? pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.TrueEntryCtls
+                                                  : pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.EntryCtls;
         if (!(~pVmcs->u32EntryCtls & EntryCtls.n.allowed0))
         { /* likely */ }