Changeset 92516 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2021 8:52:38 PM (3 years ago)

Author:

vboxsync

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

148391

Message:

VMM/CPUM,NEM: The fNestedPagingAndFullGuestExec condition in cpumR3InitCpuIdAndMsrs does not apply to NEM, as we don't do the shadow page tables there and are unlikely to have to deal with funny instructions. Any NEM restrictions should be applied selectively where needed. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -4228 +4228 @@
             if (VM_IS_NEM_ENABLED(pVM))
             {
-                LogRel(("CPUM: WARNING! Can't turn on nested VT-x/AMD-V when NEM is used!\n"));
+                LogRel(("CPUM: WARNING! Can't turn on nested VT-x/AMD-V when NEM is used! (later)\n"));
                 pConfig->fNestedHWVirt = false;
             }
@@ -4340 +4340 @@
     AssertLogRelRCReturn(rc, rc);
 
-    bool const fMayHaveXSave = fNestedPagingAndFullGuestExec
-                            && pVM->cpum.s.HostFeatures.fXSaveRstor
+    bool const fMayHaveXSave = pVM->cpum.s.HostFeatures.fXSaveRstor
                             && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor
-                            && (   !VM_IS_NEM_ENABLED(pVM)
-                                || (NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR));
+                            && (  !VM_IS_NEM_ENABLED(pVM)
+                                ? fNestedPagingAndFullGuestExec
+                                : NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR);
     uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask;
 
@@ -4545 +4545 @@
     RT_ZERO(Config);
 
-    bool const fNestedPagingAndFullGuestExec =   VM_IS_NEM_ENABLED(pVM)
-                                               ?     ((NEMHCGetFeatures(pVM) & (NEM_FEAT_F_NESTED_PAGING | NEM_FEAT_F_FULL_GST_EXEC))
-                                                  == (NEM_FEAT_F_NESTED_PAGING | NEM_FEAT_F_FULL_GST_EXEC))
-                                               : HMAreNestedPagingAndFullGuestExecEnabled(pVM);
+    bool const fNestedPagingAndFullGuestExec = VM_IS_NEM_ENABLED(pVM) || HMAreNestedPagingAndFullGuestExecEnabled(pVM);
     int rc = cpumR3CpuIdReadConfig(pVM, &Config, pCpumCfg, fNestedPagingAndFullGuestExec);
     AssertRCReturn(rc, rc);