Changeset 82039 in vbox

Timestamp:

Nov 20, 2019 5:22:21 PM (5 years ago)

Author:

vboxsync

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

134843

Message:

APIC,PDM: Split up APIC 'registration'. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (5 diffs)
• src/VBox/VMM/VMMAll/APICAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/APIC.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -3742 +3742 @@
      * @param   pDevIns             The device instance.
      */
-    DECLR3CALLBACKMEMBER(int, pfnAPICRegister,(PPDMDEVINS pDevIns));
+    DECLR3CALLBACKMEMBER(int, pfnApicRegister,(PPDMDEVINS pDevIns));
 
     /**
@@ -5175 +5175 @@
 
     /**
+     * Sets up the APIC for the ring-0 context.
+     *
+     * This must be called after ring-3 has registered the APIC using
+     * PDMDevHlpApicRegister().
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The device instance.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnApicSetUpContext,(PPDMDEVINS pDevIns));
+
+    /**
      * Sets up the IOAPIC for the ring-0 context.
      *
@@ -5225 +5236 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 14, 0)
+#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 15, 0)
 
 
@@ -7704 +7715 @@
 
 /**
- * @copydoc PDMDEVHLPR3::pfnAPICRegister
- */
-DECLINLINE(int) PDMDevHlpAPICRegister(PPDMDEVINS pDevIns)
-{
-    return pDevIns->pHlpR3->pfnAPICRegister(pDevIns);
+ * @copydoc PDMDEVHLPR3::pfnApicRegister
+ */
+DECLINLINE(int) PDMDevHlpApicRegister(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnApicRegister(pDevIns);
 }
 
@@ -7857 +7868 @@
 {
     return pDevIns->CTX_SUFF(pHlp)->pfnPICSetUpContext(pDevIns, pPicReg, ppPicHlp);
+}
+
+/**
+ * @copydoc PDMDEVHLPR0::pfnApicSetUpContext
+ */
+DECLINLINE(int) PDMDevHlpApicSetUpContext(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnApicSetUpContext(pDevIns);
 }
 

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

@@ -3515 +3515 @@
     AssertRCReturn(rc, rc);
 
+    rc = PDMDevHlpApicSetUpContext(pDevIns);
+    AssertRCReturn(rc, rc);
+
     rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, apicWriteMmio, apicReadMmio, NULL /*pvUser*/);
     AssertRCReturn(rc, rc);
@@ -3520 +3523 @@
     return VINF_SUCCESS;
 }
-#endif
+#endif /* !IN_RING3 */
 
 /**

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

@@ -1140 +1140 @@
     *ppPicHlp = &g_pdmR0PicHlp;
     LogFlow(("pdmR0DevHlp_PICSetUpContext: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
+    return VINF_SUCCESS;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR0,pfnApicSetUpContext} */
+static DECLCALLBACK(int) pdmR0DevHlp_ApicSetUpContext(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR0DevHlp_ApicSetUpContext: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    PGVM pGVM = pDevIns->Internal.s.pGVM;
+
+    /*
+     * Validate input.
+     */
+    VM_ASSERT_STATE_RETURN(pGVM, VMSTATE_CREATING, VERR_WRONG_ORDER);
+    VM_ASSERT_EMT0_RETURN(pGVM, VERR_VM_THREAD_NOT_EMT);
+
+    /* Check that it's the same device as made the ring-3 registrations: */
+    AssertLogRelMsgReturn(pGVM->pdm.s.Apic.pDevInsR3 == pDevIns->pDevInsForR3,
+                          ("%p vs %p\n", pGVM->pdm.s.Apic.pDevInsR3, pDevIns->pDevInsForR3), VERR_NOT_OWNER);
+
+    /* Check that it isn't already registered in ring-0: */
+    AssertLogRelMsgReturn(pGVM->pdm.s.Apic.pDevInsR0 == NULL, ("%p (caller pDevIns=%p)\n", pGVM->pdm.s.Apic.pDevInsR0, pDevIns),
+                          VERR_ALREADY_EXISTS);
+
+    /*
+     * Take down the instance.
+     */
+    pGVM->pdm.s.Apic.pDevInsR0 = pDevIns;
+    Log(("PDM: Registered APIC device '%s'/%d pDevIns=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, pDevIns));
+
+    /* set the helper pointer and return. */
+    LogFlow(("pdmR0DevHlp_ApicSetUpContext: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
     return VINF_SUCCESS;
 }
@@ -1310 +1343 @@
     pdmR0DevHlp_PCIBusSetUpContext,
     pdmR0DevHlp_PICSetUpContext,
+    pdmR0DevHlp_ApicSetUpContext,
     pdmR0DevHlp_IoApicSetUpContext,
     pdmR0DevHlp_HpetSetUpContext,

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

@@ -1443 +1443 @@
      * Register the APIC with PDM.
      */
-    rc = PDMDevHlpAPICRegister(pDevIns);
+    rc = PDMDevHlpApicRegister(pDevIns);
     AssertLogRelRCReturn(rc, rc);
 

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

@@ -3714 +3714 @@
 
 /** @interface_method_impl{PDMDEVHLPR3,pfnAPICRegister} */
-static DECLCALLBACK(int) pdmR3DevHlp_APICRegister(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
+static DECLCALLBACK(int) pdmR3DevHlp_ApicRegister(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    /*
+     * Validate caller context.
+     */
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_STATE_RETURN(pVM, VMSTATE_CREATING, VERR_WRONG_ORDER);
+    VM_ASSERT_EMT0_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
 
     /*
@@ -3723 +3729 @@
      * as they need to communicate and share state easily.
      */
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-    if (pVM->pdm.s.Apic.pDevInsR3)
-    {
-        AssertMsgFailed(("Only one APIC device is supported!\n"));
-        LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Initialize the RC, R0 and HC bits.
-     */
+    AssertMsgReturn(pVM->pdm.s.Apic.pDevInsR3 == NULL,
+                    ("%s/%u: Only one APIC device is supported!\n", pDevIns->pReg->szName, pDevIns->iInstance),
+                    VERR_ALREADY_EXISTS);
+
+    /*
+     * Set the ring-3 and raw-mode bits, leave the ring-0 to ring-0 setup.
+     */
+    pVM->pdm.s.Apic.pDevInsR3 = pDevIns;
     pVM->pdm.s.Apic.pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     Assert(pVM->pdm.s.Apic.pDevInsRC || !VM_IS_RAW_MODE_ENABLED(pVM));
 
-    pVM->pdm.s.Apic.pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
-    Assert(pVM->pdm.s.Apic.pDevInsR0);
-
-    pVM->pdm.s.Apic.pDevInsR3 = pDevIns;
-    LogFlow(("pdmR3DevHlp_APICRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
+    LogFlow(("pdmR3DevHlp_ApicRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
     return VINF_SUCCESS;
 }
@@ -4551 +4550 @@
     pdmR3DevHlp_PCIBusRegister,
     pdmR3DevHlp_PICRegister,
-    pdmR3DevHlp_APICRegister,
+    pdmR3DevHlp_ApicRegister,
     pdmR3DevHlp_IoApicRegister,
     pdmR3DevHlp_HpetRegister,
@@ -5047 +5046 @@
     pdmR3DevHlp_PCIBusRegister,
     pdmR3DevHlp_PICRegister,
-    pdmR3DevHlp_APICRegister,
+    pdmR3DevHlp_ApicRegister,
     pdmR3DevHlp_IoApicRegister,
     pdmR3DevHlp_HpetRegister,