Changeset 32458 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 13, 2010 4:30:10 PM (15 years ago)

Author:

vboxsync

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

65829

Message:

VMM: Return to ring-3 when DMA work is pending.

Location:

trunk/src/VBox/VMM

Files:

• VMMGC/TRPMGCHandlers.cpp (modified) (3 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -186 +186 @@
      */
     if (    rc == VINF_SUCCESS
-        &&  (   VM_FF_ISPENDING(pVM, VM_FF_TM_VIRTUAL_SYNC | VM_FF_REQUEST | VM_FF_PGM_NO_MEMORY)
+        &&  (   VM_FF_ISPENDING(pVM, VM_FF_TM_VIRTUAL_SYNC | VM_FF_REQUEST | VM_FF_PGM_NO_MEMORY | VM_FF_PDM_DMA)
              || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_TIMER | VMCPU_FF_TO_R3 | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_REQUEST | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL)
             )
@@ -205 +205 @@
         /* The Virtual Sync clock has stopped. */
         else if (VM_FF_ISPENDING(pVM, VM_FF_TM_VIRTUAL_SYNC))
+            rc = VINF_EM_RAW_TO_R3;
+        /* DMA work pending? */
+        else if (VM_FF_ISPENDING(pVM, VM_FF_PDM_DMA))
             rc = VINF_EM_RAW_TO_R3;
         /* Pending interrupt: dispatch it. */
@@ -243 +246 @@
 #endif
         }
+        /** @todo move up before SyncCR3 */
         /* Pending request packets might contain actions that need immediate attention, such as pending hardware interrupts. */
         else if (   VM_FF_ISPENDING(pVM, VM_FF_REQUEST)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1030 +1030 @@
 
     /* Check for pending actions that force us to go back to ring 3. */
-    if (    VM_FF_ISPENDING(pVM, VM_FF_HWACCM_TO_R3_MASK | VM_FF_REQUEST | VM_FF_PGM_POOL_FLUSH_PENDING)
+    if (    VM_FF_ISPENDING(pVM, VM_FF_HWACCM_TO_R3_MASK | VM_FF_REQUEST | VM_FF_PGM_POOL_FLUSH_PENDING | VM_FF_PDM_DMA)
         ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HWACCM_TO_R3_MASK | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL | VMCPU_FF_REQUEST))
     {
@@ -1072 +1072 @@
         {
             rc = VINF_PGM_POOL_FLUSH_PENDING;
+            goto end;
+        }
+
+        /* Check if DMA work is pending (2nd+ run). */
+        if (VM_FF_ISPENDING(pVM, VM_FF_PDM_DMA) && cResume > 1)
+        {
+            rc = VINF_EM_RAW_TO_R3;
             goto end;
         }

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2435 +2435 @@
 
     /* Check for pending actions that force us to go back to ring 3. */
-    if (    VM_FF_ISPENDING(pVM, VM_FF_HWACCM_TO_R3_MASK | VM_FF_REQUEST | VM_FF_PGM_POOL_FLUSH_PENDING)
+    if (    VM_FF_ISPENDING(pVM, VM_FF_HWACCM_TO_R3_MASK | VM_FF_REQUEST | VM_FF_PGM_POOL_FLUSH_PENDING | VM_FF_PDM_DMA)
         ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HWACCM_TO_R3_MASK | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL | VMCPU_FF_REQUEST))
     {
@@ -2477 +2477 @@
         {
             rc = VINF_PGM_POOL_FLUSH_PENDING;
+            goto end;
+        }
+
+        /* Check if DMA work is pending (2nd+ run). */
+        if (VM_FF_ISPENDING(pVM, VM_FF_PDM_DMA) && cResume > 1)
+        {
+            rc = VINF_EM_RAW_TO_R3;
             goto end;
         }