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

Timestamp:

Dec 1, 2015 2:17:45 PM (9 years ago)

Author:

vboxsync

Message:

HM,DBGF: Made DBGF notify HM about changes to VMM event and interrupt breakpoints. Made HM cache the basic info wrt ring-0 loop selection, opting for using a debug loop when debugging takes place to avoid cluttering slowing down the normal execution loop. The plan is to extend the single stepping loop and to put complicated dtrace probes into the same loop. Modified the VMX loop selection already.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGF.cpp (modified) (9 diffs)
• HM.cpp (modified) (1 diff)

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

@@ -1222 +1222 @@
 static DECLCALLBACK(VBOXSTRICTRC) dbgfR3EventConfigNotifyAllCpus(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
-    /* Don't do anything, just make sure all CPUs goes thru EM. */
-    NOREF(pVM); NOREF(pVCpu); NOREF(pvUser);
+    if (pvUser /*fIsHmEnabled*/)
+        HMR3NotifyDebugEventChangedPerCpu(pVM, pVCpu);
     return VINF_SUCCESS;
 }
@@ -1256 +1256 @@
 
     /*
-     * If this is an SMP setup, we must interrupt the other CPUs if there were
-     * changes just to make sure their execution engines are aware of them.
+     * Inform HM about changes.  In an SMP setup, interrupt execution on the
+     * other CPUs so their execution loop can be reselected.
      */
     int rc = VINF_SUCCESS;
-    if (cChanges > 0 && pVM->cCpus > 1)
-        rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ALL_AT_ONCE, dbgfR3EventConfigNotifyAllCpus, NULL);
+    if (cChanges > 0)
+    {
+        bool const fIsHmEnabled = HMIsEnabled(pVM);
+        if (fIsHmEnabled)
+            HMR3NotifyDebugEventChanged(pVM);
+        if (pVM->cCpus > 1 || fIsHmEnabled)
+            rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ALL_AT_ONCE, dbgfR3EventConfigNotifyAllCpus,
+                                    (void *)(uintptr_t)fIsHmEnabled);
+    }
     return rc;
 }
@@ -1393 +1400 @@
      * Apply the changes.
      */
-    bool fChanged;
+    bool fChanged = false;
+    bool fThis;
     for (uint32_t i = 0; i < cConfigs; i++)
     {
@@ -1401 +1409 @@
         if (paConfigs[i].enmHardState == DBGFINTERRUPTSTATE_ENABLED)
         {
-            fChanged = ASMAtomicBitTestAndSet(&pVM->dbgf.s.bmHardIntBreakpoints, paConfigs[i].iInterrupt) == false;
-            if (fChanged)
+            fChanged |= fThis = ASMAtomicBitTestAndSet(&pVM->dbgf.s.bmHardIntBreakpoints, paConfigs[i].iInterrupt) == false;
+            if (fThis)
             {
                 Assert(pVM->dbgf.s.cHardIntBreakpoints < 256);
@@ -1410 +1418 @@
         else if (paConfigs[i].enmHardState == DBGFINTERRUPTSTATE_DISABLED)
         {
-            fChanged = ASMAtomicBitTestAndClear(&pVM->dbgf.s.bmHardIntBreakpoints, paConfigs[i].iInterrupt) == true;
-            if (fChanged)
+            fChanged |= fThis = ASMAtomicBitTestAndClear(&pVM->dbgf.s.bmHardIntBreakpoints, paConfigs[i].iInterrupt) == true;
+            if (fThis)
             {
                 Assert(pVM->dbgf.s.cHardIntBreakpoints > 0);
@@ -1423 +1431 @@
         if (paConfigs[i].enmHardState == DBGFINTERRUPTSTATE_ENABLED)
         {
-            fChanged = ASMAtomicBitTestAndSet(&pVM->dbgf.s.bmSoftIntBreakpoints, paConfigs[i].iInterrupt) == false;
-            if (fChanged)
+            fChanged |= fThis = ASMAtomicBitTestAndSet(&pVM->dbgf.s.bmSoftIntBreakpoints, paConfigs[i].iInterrupt) == false;
+            if (fThis)
             {
                 Assert(pVM->dbgf.s.cSoftIntBreakpoints < 256);
@@ -1432 +1440 @@
         else if (paConfigs[i].enmSoftState == DBGFINTERRUPTSTATE_DISABLED)
         {
-            fChanged = ASMAtomicBitTestAndClear(&pVM->dbgf.s.bmSoftIntBreakpoints, paConfigs[i].iInterrupt) == true;
-            if (fChanged)
+            fChanged |= fThis = ASMAtomicBitTestAndClear(&pVM->dbgf.s.bmSoftIntBreakpoints, paConfigs[i].iInterrupt) == true;
+            if (fThis)
             {
                 Assert(pVM->dbgf.s.cSoftIntBreakpoints > 0);
@@ -1442 +1450 @@
 
     /*
-     * Update the event bitmap entries and see if we need to notify other CPUs.
-     */
-    fChanged = false;
+     * Update the event bitmap entries.
+     */
     if (pVM->dbgf.s.cHardIntBreakpoints > 0)
         fChanged |= ASMAtomicBitTestAndSet(&pVM->dbgf.s.bmSelectedEvents, DBGFEVENT_INTERRUPT_HARDWARE) == false;
@@ -1455 +1462 @@
         fChanged |= ASMAtomicBitTestAndClear(&pVM->dbgf.s.bmSelectedEvents, DBGFEVENT_INTERRUPT_SOFTWARE) == true;
 
+
+    /*
+     * Inform HM about changes.  In an SMP setup, interrupt execution on the
+     * other CPUs so their execution loop can be reselected.
+     */
     int rc = VINF_SUCCESS;
-    if (fChanged && pVM->cCpus > 1)
-        rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ALL_AT_ONCE, dbgfR3EventConfigNotifyAllCpus, NULL);
+    if (fChanged)
+    {
+        bool const fIsHmEnabled = HMIsEnabled(pVM);
+        if (fIsHmEnabled)
+            HMR3NotifyDebugEventChanged(pVM);
+        if (pVM->cCpus > 1 || fIsHmEnabled)
+            rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ALL_AT_ONCE, dbgfR3EventConfigNotifyAllCpus,
+                                    (void *)(uintptr_t)fIsHmEnabled);
+    }
     return rc;
 }

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

@@ -2754 +2754 @@
 
 /**
+ * Noticiation callback from DBGF when interrupt breakpoints or generic debug
+ * event settings changes.
+ *
+ * DBGF will call HMR3NotifyDebugEventChangedPerCpu on each CPU afterwards, this
+ * function is just updating the VM globals.
+ *
+ * @param   pVM         The VM cross context VM structure.
+ * @thread  EMT(0)
+ */
+VMMR3_INT_DECL(void) HMR3NotifyDebugEventChanged(PVM pVM)
+{
+    /* Interrupts. */
+    bool fUseDebugLoop = pVM->dbgf.ro.cSoftIntBreakpoints > 0
+                      || pVM->dbgf.ro.cHardIntBreakpoints > 0;
+
+    /* CPU Exceptions. */
+    for (DBGFEVENTTYPE enmEvent = DBGFEVENT_XCPT_FIRST;
+         !fUseDebugLoop && enmEvent <= DBGFEVENT_XCPT_LAST;
+         enmEvent = (DBGFEVENTTYPE)(enmEvent + 1))
+        fUseDebugLoop = DBGF_IS_EVENT_ENABLED(pVM, enmEvent);
+
+    /* Common VM exits. */
+    for (DBGFEVENTTYPE enmEvent = DBGFEVENT_EXIT_FIRST;
+         !fUseDebugLoop && enmEvent <= DBGFEVENT_EXIT_LAST_COMMON;
+         enmEvent = (DBGFEVENTTYPE)(enmEvent + 1))
+        fUseDebugLoop = DBGF_IS_EVENT_ENABLED(pVM, enmEvent);
+
+    /* Vendor specific VM exits. */
+    if (HMR3IsVmxEnabled(pVM->pUVM))
+        for (DBGFEVENTTYPE enmEvent = DBGFEVENT_EXIT_VMX_FIRST;
+             !fUseDebugLoop && enmEvent <= DBGFEVENT_EXIT_VMX_LAST;
+             enmEvent = (DBGFEVENTTYPE)(enmEvent + 1))
+            fUseDebugLoop = DBGF_IS_EVENT_ENABLED(pVM, enmEvent);
+    else
+        for (DBGFEVENTTYPE enmEvent = DBGFEVENT_EXIT_SVM_FIRST;
+             !fUseDebugLoop && enmEvent <= DBGFEVENT_EXIT_SVM_LAST;
+             enmEvent = (DBGFEVENTTYPE)(enmEvent + 1))
+            fUseDebugLoop = DBGF_IS_EVENT_ENABLED(pVM, enmEvent);
+
+    /* Done. */
+    pVM->hm.s.fUseDebugLoop = fUseDebugLoop;
+}
+
+
+/**
+ * Follow up notification callback to HMR3NotifyDebugEventChanged for each CPU.
+ *
+ * HM uses this to combine the decision made by HMR3NotifyDebugEventChanged with
+ * per CPU settings.
+ *
+ * @param   pVM         The VM cross context VM structure.
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
+ */
+VMMR3_INT_DECL(void) HMR3NotifyDebugEventChangedPerCpu(PVM pVM, PVMCPU pVCpu)
+{
+    pVCpu->hm.s.fUseDebugLoop = pVCpu->hm.s.fSingleInstruction | pVM->hm.s.fUseDebugLoop;
+}
+
+
+/**
  * Notification from EM about a rescheduling into hardware assisted execution
  * mode.