Changeset 86115 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Sep 14, 2020 6:52:26 AM (5 years ago)

Author:

vboxsync

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

140348

Message:

VMM/NEM: Implement Mesa vmwgfx #GP(0) workaround existing for SVM and VT-x already, fixes ticketref:19884

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3.cpp (modified) (2 diffs)
• NEMR3Native-win.cpp (modified) (2 diffs)

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

@@ -83 +83 @@
                                   "Enabled"
                                   "|Allow64BitGuests"
+                                  "|LovelyMesaDrvWorkaround"
 #ifdef RT_OS_WINDOWS
                                   "|UseRing0Runloop"
@@ -107 +108 @@
     pVM->nem.s.fAllow64BitGuests = false;
 #endif
+
+    /** @cfgm{/HM/LovelyMesaDrvWorkaround,bool}
+     * Workaround for mesa vmsvga 3d driver making incorrect assumptions about
+     * the hypervisor it is running under. */
+    bool f;
+    rc = CFGMR3QueryBoolDef(pCfgNem, "LovelyMesaDrvWorkaround", &f, false);
+    AssertLogRelRCReturn(rc, rc);
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+        pVCpu->nem.s.fTrapXcptGpForLovelyMesaDrv = f;
+    }
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1357 +1357 @@
                                  | RT_BIT_64(WHvX64ExceptionTypeBreakpointTrap)
                                  | RT_BIT_64(WHvX64ExceptionTypeInvalidOpcodeFault);
+
+    /* Intercept #GP to workaround the buggy mesa vmwgfx driver. */
+    PVMCPU pVCpu = pVM->apCpusR3[0]; /** @todo In theory per vCPU, in practice same for all. */
+    if (pVCpu->nem.s.fTrapXcptGpForLovelyMesaDrv)
+        Property.ExceptionExitBitmap |= RT_BIT_64(WHvX64ExceptionTypeGeneralProtectionFault);
+
     hrc = WHvSetPartitionProperty(hPartition, WHvPartitionPropertyCodeExceptionExitBitmap, &Property, sizeof(Property));
     if (FAILED(hrc))
@@ -1419 +1425 @@
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {
-        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+        pVCpu = pVM->apCpusR3[idCpu];
 
         pVCpu->nem.s.hNativeThreadHandle = (RTR3PTR)RTThreadGetNativeHandle(VMR3GetThreadHandle(pVCpu->pUVCpu));