Changeset 19437 in vbox

Timestamp:

May 6, 2009 2:34:05 PM (16 years ago)

Author:

vboxsync

Message:

SMP: send SIPI notification from APIC, let VM handle what really do

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (3 diffs)
• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMDevMiscHlp.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGC/PDMGCDevice.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (3 diffs)

trunk/include/VBox/pdmdev.h

@@ -1159 +1159 @@
     DECLRCCALLBACKMEMBER(VMCPUID, pfnGetCpuId,(PPDMDEVINS pDevIns));
 
+    /**
+     * Sends SIPI to given virtual CPU.
+     *
+     * @param   pDevIns         The APIC device instance.
+     * @param   idCpu           Virtual CPU to perform SIPI on
+     * @param   iVector         SIPI vector
+     */
+    DECLRCCALLBACKMEMBER(void,  pfnSendSipi,(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector));
+
     /** Just a safety precaution. */
     uint32_t                u32TheEnd;
@@ -1227 +1236 @@
     DECLR0CALLBACKMEMBER(VMCPUID, pfnGetCpuId,(PPDMDEVINS pDevIns));
 
+    /**
+     * Sends SIPI to given virtual CPU.
+     *
+     * @param   pDevIns         The APIC device instance.
+     * @param   idCpu           Virtual CPU to perform SIPI on
+     * @param   iVector         SIPI vector
+     */
+    DECLR0CALLBACKMEMBER(void,    pfnSendSipi,(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector));
+
     /** Just a safety precaution. */
     uint32_t                u32TheEnd;
@@ -1293 +1311 @@
      */
     DECLR3CALLBACKMEMBER(VMCPUID, pfnGetCpuId,(PPDMDEVINS pDevIns));
+
+    /**
+     * Sends SIPI to given virtual CPU.
+     *
+     * @param   pDevIns         The APIC device instance.
+     * @param   idCpu           Virtual CPU to perform SIPI on
+     * @param   iVector         SIPI vector
+     */
+    DECLR3CALLBACKMEMBER(void,    pfnSendSipi,(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector));
 
     /**

trunk/include/VBox/vmm.h

@@ -117 +117 @@
 VMMDECL(uint32_t)    VMMGetSvnRev(void);
 VMMDECL(VMMSWITCHER) VMMGetSwitcher(PVM pVM);
+VMMDECL(void)        VMMSendSipi(PVM pVM, VMCPUID idCpu, int iVector);
 
 /** @def VMMIsHwVirtExtForced

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -363 +363 @@
                                                  getCpuFromLapic(dev, s));
 }
+
+DECLINLINE(void) cpuSendSipi(APICDeviceInfo* dev, APICState *s, int vector)
+{
+    Log2(("apic: send SIPI vector=%d\n", vector));
+    dev->CTX_SUFF(pApicHlp)->pfnSendSipi(dev->CTX_SUFF(pDevIns),
+                                         getCpuFromLapic(dev, s),
+                                         vector);
+}
+
+
 
 DECLINLINE(uint32_t) getApicEnableBits(APICDeviceInfo* dev)
@@ -1081 +1091 @@
     /** @todo: init CPUs */
     LogRel(("[SMP] apic_startup: %d on CPUs %d\n", vector_num, s->id));
+    cpuSendSipi(dev, s, vector_num);
 #endif
 }

trunk/src/VBox/VMM/PDMDevMiscHlp.cpp

@@ -230 +230 @@
 }
 
+/** @copydoc PDMAPICHLPR3::pfnSendSipi */
+static DECLCALLBACK(void) pdmR3ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
+
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    PVMCPU pCpu = VMMGetCpuById(pVM, idCpu);
+    CPUMSetGuestCS(pCpu, iVector * 0x100);
+    CPUMSetGuestEIP(pCpu, 0);
+    /** @todo: how do I unhalt VCPU? */
+}
 
 /** @copydoc PDMAPICHLPR3::pfnGetRCHelpers */
@@ -273 +285 @@
     pdmR3ApicHlp_Unlock,
     pdmR3ApicHlp_GetCpuId,
+    pdmR3ApicHlp_SendSipi,
     pdmR3ApicHlp_GetRCHelpers,
     pdmR3ApicHlp_GetR0Helpers,

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

@@ -73 +73 @@
 }
 
+
+/**
+ * Sends SIPI to the virtual CPU by setting CS:EIP into vector-dependent state
+ * and unhalting processor
+ *
+ * @param   pVM         The VM to operate on.
+ * @param   idCpu       Virtual CPU to perform SIPI on
+ * @param   iVector     SIPI vector
+ */
+VMMDECL(void) VMMSendSipi(PVM pVM, VMCPUID idCpu, int iVector)
+{
+    PVMCPU pCpu = VMMGetCpuById(pVM, idCpu);
+    CPUMSetGuestCS(pCpu, iVector * 0x100);
+    CPUMSetGuestEIP(pCpu, 0);
+    /** @todo: how do I unhalt VCPU? */
+}
 
 /**

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

@@ -92 +92 @@
 static DECLCALLBACK(void) pdmRCApicHlp_Unlock(PPDMDEVINS pDevIns);
 static DECLCALLBACK(VMCPUID) pdmRCApicHlp_GetCpuId(PPDMDEVINS pDevIns);
+static DECLCALLBACK(void) pdmRCApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector);
 /** @} */
 
@@ -167 +168 @@
     pdmRCApicHlp_Unlock,
     pdmRCApicHlp_GetCpuId,
+    pdmRCApicHlp_SendSipi,
     PDM_APICHLPRC_VERSION
 };
@@ -487 +489 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     return VMMGetCpuId(pDevIns->Internal.s.pVMRC);
+}
+
+/** @copydoc PDMAPICHLPR3::pfnSendSipi */
+static DECLCALLBACK(void) pdmRCApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector)
+{
+    /* we shall never send a SIPI in raw mode */
+    AssertFailed();
 }
 

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

@@ -94 +94 @@
 static DECLCALLBACK(void) pdmR0ApicHlp_Unlock(PPDMDEVINS pDevIns);
 static DECLCALLBACK(VMCPUID) pdmR0ApicHlp_GetCpuId(PPDMDEVINS pDevIns);
+static DECLCALLBACK(void) pdmR0ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector);
 /** @} */
 
@@ -170 +171 @@
     pdmR0ApicHlp_Unlock,
     pdmR0ApicHlp_GetCpuId,
+    pdmR0ApicHlp_SendSipi,
     PDM_APICHLPR0_VERSION
 };
@@ -503 +505 @@
 }
 
+/** @copydoc PDMAPICHLPR0::pfnSendSipi */
+static DECLCALLBACK(void) pdmR0ApicHlp_SendSipi(PPDMDEVINS pDevIns, VMCPUID idCpu, int iVector)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return VMMSendSipi(pDevIns->Internal.s.pVMR0, idCpu, iVector);
+}
 
 /** @copydoc PDMIOAPICHLPR0::pfnApicBusDeliver */