Changeset 60573 in vbox

Timestamp:

Apr 19, 2016 1:27:45 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Fix INIT IPI handling, and handle callers of PDMGetInterrupt() expecting a valid
vector which may not be the case with the new APIC code.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/APICAll.cpp (modified) (12 diffs)
• VMMAll/PDMAll.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR3/TRPM.cpp (modified) (1 diff)

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

@@ -629 +629 @@
             {
                 if (VMCPUSET_IS_PRESENT(pDestCpuSet, idCpu))
+                {
+                    Log4(("APIC: apicSendIntr: Raising SMI on VCPU%u\n", idCpu));
                     APICSetInterruptFF(&pVM->aCpus[idCpu], PDMAPICIRQ_SMI);
+                }
             }
             break;
@@ -640 +643 @@
                 if (   VMCPUSET_IS_PRESENT(pDestCpuSet, idCpu)
                     && apicIsEnabled(&pVM->aCpus[idCpu]))
+                {
+                    Log4(("APIC: apicSendIntr: Raising NMI on VCPU%u\n", idCpu));
                     APICSetInterruptFF(&pVM->aCpus[idCpu], PDMAPICIRQ_NMI);
+                }
             }
             break;
@@ -650 +656 @@
             for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
                 if (VMCPUSET_IS_PRESENT(pDestCpuSet, idCpu))
+                {
+                    Log4(("APIC: apicSendIntr: Issuing INIT to VCPU%u\n", idCpu));
                     VMMR3SendInitIpi(pVM, idCpu);
+                }
 #else
             /* We need to return to ring-3 to deliver the INIT. */
@@ -663 +672 @@
             for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
                 if (VMCPUSET_IS_PRESENT(pDestCpuSet, idCpu))
+                {
+                    Log4(("APIC: apicSendIntr: Issuing SIPI to VCPU%u\n", idCpu));
                     VMMR3SendStartupIpi(pVM, idCpu, uVector);
+                }
 #else
             /* We need to return to ring-3 to deliver the SIPI. */
@@ -675 +687 @@
             for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
                 if (VMCPUSET_IS_PRESENT(pDestCpuSet, idCpu))
+                {
+                    Log4(("APIC: apicSendIntr: Raising EXTINT on VCPU%u\n", idCpu));
                     APICSetInterruptFF(&pVM->aCpus[idCpu], PDMAPICIRQ_EXTINT);
+                }
             break;
         }
@@ -911 +926 @@
 
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
-    XAPICDELIVERYMODE  const enmDeliveryMode  = (XAPICDELIVERYMODE)pXApicPage->icr_lo.u.u3DeliveryMode;
+    XAPICDELIVERYMODE const  enmDeliveryMode  = (XAPICDELIVERYMODE)pXApicPage->icr_lo.u.u3DeliveryMode;
     XAPICDESTMODE const      enmDestMode      = (XAPICDESTMODE)pXApicPage->icr_lo.u.u1DestMode;
-    XAPICINITLEVEL           enmInitLevel     = (XAPICINITLEVEL)pXApicPage->icr_lo.u.u1Level;
-    XAPICTRIGGERMODE         enmTriggerMode   = (XAPICTRIGGERMODE)pXApicPage->icr_lo.u.u1TriggerMode;
+    XAPICINITLEVEL const     enmInitLevel     = (XAPICINITLEVEL)pXApicPage->icr_lo.u.u1Level;
+    XAPICTRIGGERMODE const   enmTriggerMode   = (XAPICTRIGGERMODE)pXApicPage->icr_lo.u.u1TriggerMode;
     XAPICDESTSHORTHAND const enmDestShorthand = (XAPICDESTSHORTHAND)pXApicPage->icr_lo.u.u2DestShorthand;
     uint8_t const            uVector          = pXApicPage->icr_lo.u.u8Vector;
@@ -924 +939 @@
     /*
      * INIT Level De-assert is not support on Pentium 4 and Xeon processors.
+     * See AMD spec. 16.5 "Interprocessor Interrupts (IPI)" for a table of valid ICR combinations.
      */
     if (RT_UNLIKELY(   enmDeliveryMode == XAPICDELIVERYMODE_INIT_LEVEL_DEASSERT
@@ -929 +945 @@
                     && enmTriggerMode  == XAPICTRIGGERMODE_LEVEL))
     {
+        Log4(("APIC%u: INIT level de-assert unsupported, ignoring!\n", pVCpu->idCpu));
         return VINF_SUCCESS;
     }
-
-    enmInitLevel   = XAPICINITLEVEL_ASSERT;
-    enmTriggerMode = XAPICTRIGGERMODE_EDGE;
 #else
 # error "Implement Pentium and P6 family APIC architectures"
@@ -1015 +1029 @@
     Log4(("APIC%u: apicSetIcrLo: uIcrLo=%#RX32\n", pVCpu->idCpu, pXApicPage->icr_lo.all.u32IcrLo));
 
-    apicSendIpi(pVCpu, rcRZ);
-    return VINF_SUCCESS;
+    return apicSendIpi(pVCpu, rcRZ);
 }
 
@@ -2263 +2276 @@
 
     PXAPICPAGE pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
-    if (   apicIsEnabled(pVCpu)
+    bool const fApicHwEnabled = apicIsEnabled(pVCpu);
+    if (   fApicHwEnabled
         && pXApicPage->svr.u.fApicSoftwareEnable)
     {
@@ -2295 +2309 @@
                 return uVector;
             }
-        }
-    }
+            else
+                Log4(("APIC%u: APICGetInterrupt: Interrupt's priority is not higher than the PPR uVector=%#x PPR=%#x\n",
+                      pVCpu->idCpu, uVector, uPpr));
+        }
+        else
+            Log4(("APIC%u: APICGetInterrupt: No pending bits in IRR\n", pVCpu->idCpu));
+    }
+    else
+        Log4(("APIC%u: APICGetInterrupt: APIC %s disabled\n", pVCpu->idCpu, !fApicHwEnabled ? "hardware" : "software"));
 
     return -1;
@@ -2318 +2339 @@
     STAM_COUNTER_INC(&pVCpu->apic.s.CTX_SUFF(StatMmioRead));
 
-    Log4(("APIC%u: ApicReadMmio: offReg=%#RX16\n", pVCpu->idCpu, offReg));
-
     int rc = apicReadRegister(pApicDev, pVCpu, offReg, &uValue);
     *(uint32_t *)pv = uValue;
+
+    Log4(("APIC%u: ApicReadMmio: offReg=%#RX16 uValue=%#RX32\n", pVCpu->idCpu, offReg, uValue));
     return rc;
 }

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

@@ -61 +61 @@
         uint32_t uTagSrc;
         int i = pVM->pdm.s.Apic.CTX_SUFF(pfnGetInterrupt)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu, &uTagSrc);
+#ifndef VBOX_WITH_NEW_APIC
         AssertMsg(i <= 255 && i >= 0, ("i=%d\n", i));
+#endif
         if (i >= 0)
         {

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

@@ -7444 +7444 @@
             else
             {
-                /** @todo Does this actually happen? If not turn it into an assertion. */
+                /* This can happen with the new APIC code. */
+#ifndef VBOX_WITH_NEW_APIC
                 Assert(!VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)));
+#endif
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchGuestIrq);
             }

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

@@ -1555 +1555 @@
         else
         {
+#ifndef VBOX_WITH_NEW_APIC
             AssertRC(rc);
+#endif
             return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
         }