Changeset 92449 in vbox

Timestamp:

Nov 16, 2021 10:37:10 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM: Add NEMHCGetFeatures() to return a bitmask of features supported by the native NEM backend and make use of it in CPUMR3CpuId to determine whether to pass through xsave/xrstor support to the guest, bugref:9044

Location:

trunk

Files:

• include/VBox/vmm/nem.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/NEMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/nem.h

@@ -187 +187 @@
  */
 VMM_INT_DECL(bool) NEMHCIsLongModeAllowed(PVMCC pVM);
+VMM_INT_DECL(uint32_t) NEMHCGetFeatures(PVMCC pVM);
 VMM_INT_DECL(int)  NEMImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat);
+
+/** @name NEM_FEAT_F_XXX - Features supported by the NEM backend
+ * @{ */
+/** NEM backend uses nested paging for the guest. */
+#define NEM_FEAT_F_NESTED_PAGING    RT_BIT(0)
+/** NEM backend uses full (unrestricted) guest execution. */
+#define NEM_FEAT_F_FULL_GST_EXEC    RT_BIT(1)
+/** NEM backend offers an xsave/xrstor interface. */
+#define NEM_FEAT_F_XSAVE_XRSTOR     RT_BIT(2)
+/** @} */
 
 VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalRegister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb);

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

@@ -89 +89 @@
 
 #ifndef VBOX_WITH_NATIVE_NEM
+VMM_INT_DECL(uint32_t) NEMHCGetFeatures(PVMCC pVM)
+{
+    RT_NOREF(pVM);
+    return 0;
+}
+#endif
+
+
+#ifndef VBOX_WITH_NATIVE_NEM
 VMM_INT_DECL(int) NEMImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat)
 {

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -5118 +5118 @@
 }
 
+
+/**
+ * Returns features supported by the NEM backend.
+ *
+ * @returns Flags of features supported by the native NEM backend.
+ * @param   pVM             The cross context VM structure.
+ */
+VMM_INT_DECL(uint32_t) NEMHCGetFeatures(PVMCC pVM)
+{
+    RT_NOREF(pVM);
+    /** @todo Make use of the WHvGetVirtualProcessorXsaveState/WHvSetVirtualProcessorXsaveState
+     * interface added in 2019 to enable passthrough of xsave/xrstor (and depending) features to the guest. */
+    /** @todo Is NEM_FEAT_F_FULL_GST_EXEC always true? */
+    return NEM_FEAT_F_NESTED_PAGING | NEM_FEAT_F_FULL_GST_EXEC;
+}

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

@@ -4324 +4324 @@
     bool const fMayHaveXSave = fNestedPagingAndFullGuestExec
                             && pVM->cpum.s.HostFeatures.fXSaveRstor
-                            && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor;
+                            && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor
+                            && (   !VM_IS_NEM_ENABLED(pVM)
+                                || (NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR));
     uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask;
 
@@ -4525 +4527 @@
     RT_ZERO(Config);
 
-    int rc = cpumR3CpuIdReadConfig(pVM, &Config, pCpumCfg, HMAreNestedPagingAndFullGuestExecEnabled(pVM));
+    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);
+    int rc = cpumR3CpuIdReadConfig(pVM, &Config, pCpumCfg, fNestedPagingAndFullGuestExec);
     AssertRCReturn(rc, rc);