Changeset 80062 in vbox

Timestamp:

Jul 31, 2019 8:57:49 AM (6 years ago)

Author:

vboxsync

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

132501

Message:

VMM: Kicking out raw-mode - APIC. bugref:9517

Location:

trunk

Files:

• include/VBox/vmm/apic.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/APICAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/APIC.cpp (modified) (18 diffs)
• src/VBox/VMM/include/APICInternal.h (modified) (7 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/include/VBox/vmm/apic.h

@@ -187 +187 @@
 VMM_INT_DECL(int)           APICBusDeliver(PVM pVM, uint8_t uDest, uint8_t uDestMode, uint8_t uDeliveryMode, uint8_t uVector,
                                            uint8_t uPolarity, uint8_t uTriggerMode, uint32_t uTagSrc);
-VMM_INT_DECL(int)           APICGetApicPageForCpu(PCVMCPU pVCpu, PRTHCPHYS pHCPhys, PRTR0PTR pR0Ptr, PRTR3PTR pR3Ptr,
-                                                  PRTRCPTR pRCPtr);
+VMM_INT_DECL(int)           APICGetApicPageForCpu(PCVMCPU pVCpu, PRTHCPHYS pHCPhys, PRTR0PTR pR0Ptr, PRTR3PTR pR3Ptr);
 
 /** @name Hyper-V interface (Ring-3 and all-context API).

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

@@ -3490 +3490 @@
  * @param   pR0Ptr          Where to store the ring-0 address.
  * @param   pR3Ptr          Where to store the ring-3 address (optional).
- * @param   pRCPtr          Where to store the raw-mode context address
- *                          (optional).
- */
-VMM_INT_DECL(int) APICGetApicPageForCpu(PCVMCPU pVCpu, PRTHCPHYS pHCPhys, PRTR0PTR pR0Ptr, PRTR3PTR pR3Ptr, PRTRCPTR pRCPtr)
+ */
+VMM_INT_DECL(int) APICGetApicPageForCpu(PCVMCPU pVCpu, PRTHCPHYS pHCPhys, PRTR0PTR pR0Ptr, PRTR3PTR pR3Ptr)
 {
     AssertReturn(pVCpu,   VERR_INVALID_PARAMETER);
@@ -3506 +3504 @@
     if (pR3Ptr)
         *pR3Ptr  = pApicCpu->pvApicPageR3;
-    if (pRCPtr)
-        *pRCPtr  = pApicCpu->pvApicPageRC;
     return VINF_SUCCESS;
 }

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

@@ -1808 +1808 @@
                 if (   PDMHasApic(pVCpu->CTX_SUFF(pVM))
                     && (pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_TPR_SHADOW))
-                {
-                    rc = APICGetApicPageForCpu(pVCpu, &pVmcsInfo->HCPhysVirtApic, (PRTR0PTR)&pVmcsInfo->pbVirtApic,
-                                               NULL /* pR3Ptr */, NULL /* pRCPtr */);
-                }
+                    rc = APICGetApicPageForCpu(pVCpu, &pVmcsInfo->HCPhysVirtApic, (PRTR0PTR)&pVmcsInfo->pbVirtApic, NULL /*pR3Ptr*/);
             }
         }

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

@@ -1190 +1190 @@
 static DECLCALLBACK(void) apicR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PVM      pVM      = PDMDevHlpGetVM(pDevIns);
-    PAPIC    pApic    = VM_TO_APIC(pVM);
-    PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
-
-    LogFlow(("APIC: apicR3Relocate: pVM=%p pDevIns=%p offDelta=%RGi\n", pVM, pDevIns, offDelta));
-
-    pApicDev->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-
-    pApic->pApicDevRC   = PDMINS_2_DATA_RCPTR(pDevIns);
-    pApic->pvApicPibRC += offDelta;
-
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU   pVCpu         = &pVM->aCpus[idCpu];
-        PAPICCPU pApicCpu      = VMCPU_TO_APICCPU(pVCpu);
-        pApicCpu->pTimerRC     = TMTimerRCPtr(pApicCpu->pTimerR3);
-
-        pApicCpu->pvApicPageRC += offDelta;
-        pApicCpu->pvApicPibRC  += offDelta;
-        Log2(("APIC%u: apicR3Relocate: APIC PIB at %RGv\n", pVCpu->idCpu, pApicCpu->pvApicPibRC));
-    }
+    RT_NOREF(pDevIns, offDelta);
 }
 
@@ -1234 +1214 @@
         pApic->pvApicPibR3 = NIL_RTR3PTR;
         pApic->pvApicPibR0 = NIL_RTR0PTR;
-        pApic->pvApicPibRC = NIL_RTRCPTR;
     }
 
@@ -1245 +1224 @@
         pApicCpu->pvApicPibR3 = NIL_RTR3PTR;
         pApicCpu->pvApicPibR0 = NIL_RTR0PTR;
-        pApicCpu->pvApicPibRC = NIL_RTRCPTR;
 
         if (pApicCpu->pvApicPageR3 != NIL_RTR3PTR)
@@ -1252 +1230 @@
             pApicCpu->pvApicPageR3 = NIL_RTR3PTR;
             pApicCpu->pvApicPageR0 = NIL_RTR0PTR;
-            pApicCpu->pvApicPageRC = NIL_RTRCPTR;
         }
     }
@@ -1268 +1245 @@
     PAPIC pApic = VM_TO_APIC(pVM);
     LogFlow(("APIC: apicR3InitState: pVM=%p\n", pVM));
-
-    /* With hardware virtualization, we don't need to map the APIC in GC. */
-    bool const fNeedsGCMapping = VM_IS_RAW_MODE_ENABLED(pVM);
 
     /*
@@ -1280 +1254 @@
     Assert(pApic->pvApicPibR3 == NIL_RTR3PTR);
     Assert(pApic->pvApicPibR0 == NIL_RTR0PTR);
-    Assert(pApic->pvApicPibRC == NIL_RTRCPTR);
     pApic->cbApicPib    = RT_ALIGN_Z(pVM->cCpus * sizeof(APICPIB), PAGE_SIZE);
     size_t const cPages = pApic->cbApicPib >> PAGE_SHIFT;
@@ -1311 +1284 @@
         RT_BZERO(pApic->pvApicPibR3, pApic->cbApicPib);
 
-        /* Map the PIB into GC.  */
-        if (fNeedsGCMapping)
-        {
-            pApic->pvApicPibRC = NIL_RTRCPTR;
-            int rc = MMR3HyperMapHCPhys(pVM, pApic->pvApicPibR3, NIL_RTR0PTR, pApic->HCPhysApicPib, pApic->cbApicPib,
-                                        "APIC PIB", (PRTGCPTR)&pApic->pvApicPibRC);
-            if (RT_FAILURE(rc))
-            {
-                LogRel(("APIC: Failed to map %u bytes for the pending-interrupt bitmap into GC, rc=%Rrc\n", pApic->cbApicPib,
-                        rc));
-                apicR3TermState(pVM);
-                return rc;
-            }
-
-            AssertLogRelReturn(pApic->pvApicPibRC != NIL_RTRCPTR, VERR_INTERNAL_ERROR);
-        }
-
         /*
          * Allocate the map the virtual-APIC pages.
@@ -1343 +1299 @@
             Assert(pApicCpu->pvApicPageR3 == NIL_RTR3PTR);
             Assert(pApicCpu->pvApicPageR0 == NIL_RTR0PTR);
-            Assert(pApicCpu->pvApicPageRC == NIL_RTRCPTR);
             AssertCompile(sizeof(XAPICPAGE) == PAGE_SIZE);
             pApicCpu->cbApicPage = sizeof(XAPICPAGE);
@@ -1354 +1309 @@
                 pApicCpu->HCPhysApicPage = SupApicPage.Phys;
 
-                /* Map the virtual-APIC page into GC. */
-                if (fNeedsGCMapping)
-                {
-                    rc = MMR3HyperMapHCPhys(pVM, pApicCpu->pvApicPageR3, NIL_RTR0PTR, pApicCpu->HCPhysApicPage,
-                                            pApicCpu->cbApicPage, "APIC", (PRTGCPTR)&pApicCpu->pvApicPageRC);
-                    if (RT_FAILURE(rc))
-                    {
-                        LogRel(("APIC%u: Failed to map %u bytes for the virtual-APIC page into GC, rc=%Rrc", idCpu,
-                                pApicCpu->cbApicPage, rc));
-                        apicR3TermState(pVM);
-                        return rc;
-                    }
-
-                    AssertLogRelReturn(pApicCpu->pvApicPageRC != NIL_RTRCPTR, VERR_INTERNAL_ERROR);
-                }
-
                 /* Associate the per-VCPU PIB pointers to the per-VM PIB mapping. */
                 uint32_t const offApicPib  = idCpu * sizeof(APICPIB);
                 pApicCpu->pvApicPibR0      = (RTR0PTR)((RTR0UINTPTR)pApic->pvApicPibR0 + offApicPib);
                 pApicCpu->pvApicPibR3      = (RTR3PTR)((RTR3UINTPTR)pApic->pvApicPibR3 + offApicPib);
-                if (fNeedsGCMapping)
-                    pApicCpu->pvApicPibRC  = (RTRCPTR)((RTRCUINTPTR)pApic->pvApicPibRC + offApicPib);
 
                 /* Initialize the virtual-APIC state. */
@@ -1384 +1321 @@
                 Assert(pApicCpu->pvApicPibR3 != NIL_RTR3PTR);
                 Assert(pApicCpu->pvApicPibR0 != NIL_RTR0PTR);
-                Assert(!fNeedsGCMapping || pApicCpu->pvApicPibRC != NIL_RTRCPTR);
                 Assert(pApicCpu->pvApicPageR3 != NIL_RTR3PTR);
-                Assert(pApicCpu->pvApicPageR0 != NIL_RTR0PTR);
-                Assert(!fNeedsGCMapping || pApicCpu->pvApicPageRC != NIL_RTRCPTR);
-                Assert(!fNeedsGCMapping || pApic->pvApicPibRC == pVM->aCpus[0].apic.s.pvApicPibRC);
 #endif
             }
@@ -1402 +1335 @@
         Assert(pApic->pvApicPibR3 != NIL_RTR3PTR);
         Assert(pApic->pvApicPibR0 != NIL_RTR0PTR);
-        Assert(!fNeedsGCMapping || pApic->pvApicPibRC != NIL_RTRCPTR);
 #endif
         return VINF_SUCCESS;
@@ -1418 +1350 @@
 static DECLCALLBACK(int) apicR3Destruct(PPDMDEVINS pDevIns)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
     PVM pVM = PDMDevHlpGetVM(pDevIns);
     LogFlow(("APIC: apicR3Destruct: pVM=%p\n", pVM));
@@ -1460 +1393 @@
      * Validate inputs.
      */
+    Assert(pDevIns);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     Assert(iInstance == 0); NOREF(iInstance);
-    Assert(pDevIns);
 
     PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
@@ -1472 +1406 @@
     pApicDev->pDevInsR3 = pDevIns;
     pApicDev->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
-    pApicDev->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
 
     pApic->pApicDevR0   = PDMINS_2_DATA_R0PTR(pDevIns);
     pApic->pApicDevR3   = (PAPICDEV)PDMINS_2_DATA_R3PTR(pDevIns);
-    pApic->pApicDevRC   = PDMINS_2_DATA_RCPTR(pDevIns);
 
     /*
@@ -1559 +1491 @@
     if (pApic->fRZEnabled)
     {
-        rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysApicBase, sizeof(XAPICPAGE), NIL_RTRCPTR /*pvUser*/,
-                                     "apicWriteMmio", "apicReadMmio");
-        if (RT_FAILURE(rc))
-            return rc;
-
         rc = PDMDevHlpMMIORegisterR0(pDevIns, GCPhysApicBase, sizeof(XAPICPAGE), NIL_RTR0PTR /*pvUser*/,
                                      "apicWriteMmio", "apicReadMmio");
@@ -1580 +1507 @@
         rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, apicR3TimerCallback, pVCpu, TMTIMER_FLAGS_NO_CRIT_SECT,
                                     pApicCpu->szTimerDesc, &pApicCpu->pTimerR3);
-        if (RT_SUCCESS(rc))
-        {
-            pApicCpu->pTimerR0 = TMTimerR0Ptr(pApicCpu->pTimerR3);
-            pApicCpu->pTimerRC = TMTimerRCPtr(pApicCpu->pTimerR3);
-        }
-        else
-            return rc;
+        AssertRCReturn(rc, rc);
+        pApicCpu->pTimerR0 = TMTimerR0Ptr(pApicCpu->pTimerR3);
     }
 
@@ -1684 +1606 @@
     "apic",
     /* szRCMod */
-    "VMMRC.rc",
+    "",
     /* szR0Mod */
     "VMMR0.r0",
@@ -1691 +1613 @@
     /* fFlags */
       PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_32_64 | PDM_DEVREG_FLAGS_PAE36
-    | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
+    | PDM_DEVREG_FLAGS_R0,
     /* fClass */
     PDM_DEVREG_CLASS_PIC,

trunk/src/VBox/VMM/include/APICInternal.h

@@ -1157 +1157 @@
     /** The device instance - R3 Ptr. */
     PPDMDEVINSR3                pDevInsR3;
-    /** Alignment padding. */
-    R3PTRTYPE(void *)           pvAlignment0;
-
     /** The device instance - R0 Ptr. */
     PPDMDEVINSR0                pDevInsR0;
-    /** Alignment padding. */
-    R0PTRTYPE(void *)           pvAlignment1;
-
-    /** The device instance - RC Ptr. */
-    PPDMDEVINSRC                pDevInsRC;
 } APICDEV;
 /** Pointer to an APIC device. */
@@ -1184 +1176 @@
     /** The APIC device - R3 ptr. */
     R3PTRTYPE(PAPICDEV)         pApicDevR3;
-    /** The APIC device - RC ptr. */
-    RCPTRTYPE(PAPICDEV)         pApicDevRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment0;
     /** @} */
 
@@ -1202 +1190 @@
     /** The APIC PIB virtual address - R3 ptr. */
     R3PTRTYPE(void *)           pvApicPibR3;
-    /** The APIC PIB virtual address - RC ptr. */
-    RCPTRTYPE(void *)           pvApicPibRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment1;
     /** The size of the page in bytes. */
     uint32_t                    cbApicPib;
@@ -1260 +1244 @@
     /** The APIC page virtual address - R3 ptr. */
     R3PTRTYPE(void *)           pvApicPageR3;
-    /** The APIC page virtual address - RC ptr. */
-    RCPTRTYPE(void *)           pvApicPageRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment0;
     /** The size of the page in bytes. */
     uint32_t                    cbApicPage;
@@ -1284 +1264 @@
     /** The APIC PIB virtual address - R3 ptr. */
     R3PTRTYPE(void *)           pvApicPibR3;
-    /** The APIC PIB virtual address - RC ptr. */
-    RCPTRTYPE(void *)           pvApicPibRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment1;
     /** The APIC PIB for level-sensitive interrupts. */
     APICPIB                     ApicPibLevel;
@@ -1310 +1286 @@
     /** The timer - R3 ptr. */
     PTMTIMERR3                  pTimerR3;
-    /** The timer - RC ptr. */
-    PTMTIMERRC                  pTimerRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment3;
-    /** The timer critical sect protecting @a u64TimerInitial  */
-    PDMCRITSECT                 TimerCritSect;
     /** The time stamp when the timer was initialized. */
     uint64_t                    u64TimerInitial;
@@ -1322 +1292 @@
     /** Cache of timer shift of the frequency hint to TM. */
     uint32_t                    uHintedTimerShift;
+    /** The timer critical sect protecting @a u64TimerInitial  */
+    PDMCRITSECT                 TimerCritSect;
     /** The timer description. */
     char                        szTimerDesc[32];

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -1403 +1403 @@
     GEN_CHECK_OFF(APIC, pApicDevR0);
     GEN_CHECK_OFF(APIC, pApicDevR3);
-    GEN_CHECK_OFF(APIC, pApicDevRC);
     GEN_CHECK_OFF(APIC, pvApicPibR0);
     GEN_CHECK_OFF(APIC, pvApicPibR3);
-    GEN_CHECK_OFF(APIC, pvApicPibRC);
     GEN_CHECK_OFF(APIC, cbApicPib);
     GEN_CHECK_OFF(APIC, enmMaxMode);
     GEN_CHECK_OFF(APICCPU, pvApicPageR0);
     GEN_CHECK_OFF(APICCPU, pvApicPageR3);
-    GEN_CHECK_OFF(APICCPU, pvApicPageRC);
-    GEN_CHECK_OFF(APICCPU, pvApicPageRC);
     GEN_CHECK_OFF(APICCPU, cbApicPage);
     GEN_CHECK_OFF(APICCPU, pvApicPibR0);
     GEN_CHECK_OFF(APICCPU, pvApicPibR3);
-    GEN_CHECK_OFF(APICCPU, pvApicPibRC);
     GEN_CHECK_OFF(APICCPU, ApicPibLevel);
     GEN_CHECK_OFF(APICCPU, pTimerR0);
     GEN_CHECK_OFF(APICCPU, pTimerR3);
-    GEN_CHECK_OFF(APICCPU, pTimerRC);
     GEN_CHECK_OFF(APICCPU, TimerCritSect);