Changeset 23198 in vbox

Timestamp:

Sep 21, 2009 4:07:16 PM (16 years ago)

Author:

vboxsync

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

52635

Message:

Fall back to RTMpOnSpecific for those host platforms that don't implement RTMpPokeCpu.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HWACCMAll.cpp (modified) (2 diffs)
• PGMAllPool.cpp (modified) (4 diffs)

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

@@ -146 +146 @@
 }
 
+
+/**
+ * Dummy RTMpOnSpecific handler since RTMpPokeCpu couldn't be used. 
+ *
+ */
+static DECLCALLBACK(void) hwaccmFlushHandler(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    return;
+}
+
+
 /**
  * Flush the TLBs of all VCPUs
@@ -177 +188 @@
             RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
             if (idHostCpu != NIL_RTCPUID)
-                RTMpPokeCpu(idHostCpu);
+            {
+                int rc = RTMpPokeCpu(idHostCpu);
+# ifdef RT_OS_WINDOWS
+                AssertRC(rc);
+# else
+                /* Not implemented on some platforms (Darwin, Linux kernel < 2.6.19); fall back to a less efficient implementation (broadcast). */
+                if (rc == VERR_NOT_SUPPORTED)
+                    RTMpOnSpecific(idHostCpu, hwaccmFlushHandler, 0, 0);
+# endif
+            }
 #else
             VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);

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

@@ -64 +64 @@
 #ifdef LOG_ENABLED
 static const char *pgmPoolPoolKindToStr(uint8_t enmKind);
+#endif
+#if defined(VBOX_STRICT) && defined(PGMPOOL_WITH_OPTIMIZED_DIRTY_PT)
+static void pgmPoolTrackCheckPTPaePae(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PTPAE pShwPT, PCX86PTPAE pGstPT);
 #endif
 
@@ -1166 +1169 @@
         return VINF_SUCCESS;
     }
+#ifdef PGMPOOL_WITH_OPTIMIZED_DIRTY_PT
+    if (pPage->fDirty)
+    {
+        Assert(VMCPU_FF_ISSET(pVCpu, VMCPU_FF_TLB_FLUSH));
+        return VINF_SUCCESS;    /* SMP guest case where we were blocking on the pgm lock while the same page was being marked dirty. */
+    }
+#endif
+
+#if defined(VBOX_STRICT) && defined(PGMPOOL_WITH_OPTIMIZED_DIRTY_PT)
+    if (pPage->enmKind == PGMPOOLKIND_PAE_PT_FOR_PAE_PT)
+    {
+        void *pvShw = PGMPOOL_PAGE_2_LOCKED_PTR(pPool->CTX_SUFF(pVM), pPage);
+        void *pvGst;
+        int rc = PGM_GCPHYS_2_PTR(pPool->CTX_SUFF(pVM), pPage->GCPhys, &pvGst); AssertReleaseRC(rc);
+        pgmPoolTrackCheckPTPaePae(pPool, pPage, (PX86PTPAE)pvShw, (PCX86PTPAE)pvGst);
+    }
+#endif
 
     /*
@@ -1181 +1201 @@
      */
     Assert(pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
-    Assert(!pPage->fDirty);
 
 #ifdef IN_RING0
@@ -1421 +1440 @@
  * @param   pGstPT      The guest page table.
  */
-DECLINLINE(void) pgmPoolTrackCheckPTPaePae(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PTPAE pShwPT, PCX86PTPAE pGstPT)
+static void pgmPoolTrackCheckPTPaePae(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PTPAE pShwPT, PCX86PTPAE pGstPT)
 {
     unsigned cErrors = 0;