Changeset 55034 in vbox

Timestamp:

Mar 31, 2015 1:41:56 PM (10 years ago)

Author:

vboxsync

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

99319

Message:

VMM: Added VMCPU_FF_UNHALT force-flag.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -371 +371 @@
 /** PDM critical section unlocking is pending, process promptly upon return to R3. */
 #define VMCPU_FF_PDM_CRITSECT               RT_BIT_32(5)
+/** This action forces the VCPU out of the halted state. */
+#define VMCPU_FF_UNHALT                     RT_BIT_32(6)
 /** This action forces the VM to service pending requests from other
  * thread or requests which must be executed in another context. */
@@ -429 +431 @@
 /** Externally forced VMCPU actions. Used to quit the idle/wait loop. */
 #define VMCPU_FF_EXTERNAL_HALTED_MASK           (  VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_REQUEST \
-                                                 | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_TIMER)
+                                                 | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_UNHALT \
+                                                 | VMCPU_FF_TIMER)
 
 /** High priority VM pre-execution actions. */
@@ -466 +469 @@
                                                  | VM_FF_EMT_RENDEZVOUS)
 /** Normal priority VMCPU actions. */
-#define VMCPU_FF_NORMAL_PRIORITY_MASK           (VMCPU_FF_REQUEST)
+#define VMCPU_FF_NORMAL_PRIORITY_MASK           (VMCPU_FF_REQUEST | VMCPU_FF_UNHALT)
 
 /** Flags to clear before resuming guest execution. */

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

@@ -1855 +1855 @@
         }
 
+        /*
+         * Forced unhalting of EMT.
+         */
+        if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UNHALT))
+        {
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UNHALT);
+            if (rc == VINF_EM_HALT)
+            {
+                rc2 = VINF_EM_RESCHEDULE;
+                UPDATE_RC();
+            }
+        }
+
         /* check that we got them all  */
-        Assert(!(VMCPU_FF_NORMAL_PRIORITY_MASK & ~(VMCPU_FF_REQUEST)));
+        Assert(!(VMCPU_FF_NORMAL_PRIORITY_MASK & ~(VMCPU_FF_REQUEST | VMCPU_FF_UNHALT)));
     }
 
@@ -2551 +2564 @@
                         if (   rc == VINF_SUCCESS
                             && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
-                                                        | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI))
+                                                        | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_UNHALT))
                         {
                             Log(("EMR3ExecuteVM: Triggering reschedule on pending IRQ after MWAIT\n"));
@@ -2561 +2574 @@
                         rc = VMR3WaitHalted(pVM, pVCpu, !(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
                         if (   rc == VINF_SUCCESS
-                            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NMI | VMCPU_FF_INTERRUPT_SMI))
+                            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NMI | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_UNHALT))
                         {
-                            Log(("EMR3ExecuteVM: Triggering reschedule on pending NMI/SMI after HLT\n"));
+                            Log(("EMR3ExecuteVM: Triggering reschedule on pending NMI/SMI/UNHALT after HLT\n"));
                             rc = VINF_EM_RESCHEDULE;
                         }

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

@@ -2411 +2411 @@
         PRINT_FLAG(VMCPU_FF_,INTERRUPT_SMI);
         PRINT_FLAG(VMCPU_FF_,PDM_CRITSECT);
+        PRINT_FLAG(VMCPU_FF_,UNHALT);
         PRINT_FLAG(VMCPU_FF_,REQUEST);
         PRINT_FLAG(VMCPU_FF_,HM_UPDATE_CR3);