vbox的更動 36441 路徑 trunk/src

時間撮記:

2011-3-25 下午09:11:56 (14 年 以前)

作者:

vboxsync

訊息:

VMM: Sketched out where to do the initial I/O MMU setup. This adds a VMINITCOMPLETED_HWACCM and makes HWACCMR3InitFinalizeR0 private (invoked from HWACCMR3InitCompleted(,_RING0).

位置:

trunk/src/VBox/VMM

檔案:

• Makefile.kmk (修改) (2 筆差異)
• VMMR0/GMMR0.cpp (修改) (2 筆差異)
• VMMR0/PGMR0.cpp (修改) (1 筆差異)
• VMMR0/VMMR0.cpp (修改) (1 筆差異)
• VMMR3/HWACCM.cpp (修改) (3 筆差異)
• VMMR3/PGM.cpp (修改) (2 筆差異)
• VMMR3/PGMPhys.cpp (修改) (1 筆差異)
• VMMR3/VM.cpp (修改) (2 筆差異)
• include/PGMInternal.h (修改) (1 筆差異)

trunk/src/VBox/VMM/Makefile.kmk

@@ -41 +41 @@
 ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
  VMM_COMMON_DEFS += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+endif
+ifdef VBOX_WITH_PCI_PASSTHROUGH
+ VMM_COMMON_DEFS += VBOX_WITH_PCI_PASSTHROUGH
 endif
 # VMM_COMMON_DEFS += VBOX_WITH_NS_ACCOUNTING_STATS
@@ -438 +441 @@
  endif
  ifdef VBOX_WITH_PCI_PASSTHROUGH
-  VMMR0_DEFS    += VBOX_WITH_PCI_PASSTHROUGH IN_PCIRAW_R0
+  VMMR0_DEFS    += IN_PCIRAW_R0
  endif
  VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007 Oracle Corporation
+ * Copyright (C) 2007-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2105 +2105 @@
                                 AssertCompile(NIL_RTHCPHYS > GMM_GCPHYS_LAST && GMM_GCPHYS_UNSHAREABLE > GMM_GCPHYS_LAST);
                                 if (RT_LIKELY(paPages[iPage].HCPhysGCPhys <= GMM_GCPHYS_LAST))
-                                {
                                     pPage->Private.pfn = paPages[iPage].HCPhysGCPhys >> PAGE_SHIFT;
-#if 0 /* Not sure if this is the right place to tell pciraw about mappings. */
-                                    if (PciRawIsEnabled(pGVM/pVM))
-                                        PciRawR0NotifyGuestPageAssignment(pGVM, paPages[iPage].HCPhysGCPhys,
-                                                                          gmmR0GetPageHCPhys(pGMM, paPages[iPage].idPage));
-#endif
-                                }
                                 else if (paPages[iPage].HCPhysGCPhys == GMM_GCPHYS_UNSHAREABLE)
                                     pPage->Private.pfn = GMM_PAGE_PFN_UNSHAREABLE;

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

@@ -190 +190 @@
 
 
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+/* Interface sketch.  The interface belongs to a global PCI pass-through
+   manager.  It shall use the global VM handle, not the user VM handle to
+   store the per-VM info (domain) since that is all ring-0 stuff, thus
+   passing pGVM here.  I've tentitively prefixed the functions 'GPicRawR0',
+   we can discuss the PciRaw code re-organtization when I'm back from
+   vacation.
+
+   I've implemented the initial IOMMU set up below.  For things to work
+   reliably, we will probably need add a whole bunch of checks and
+   GPciRawR0GuestPageUpdate call to the PGM code.  For the present,
+   assuming nested paging (enforced) and prealloc (enforced), no
+   ballooning (check missing), page sharing (check missing) or live
+   migration (check missing), it might work fine.  At least if some
+   VM power-off hook is present and can tear down the IOMMU page tables. */
+
+/**
+ * Tells the global PCI pass-through manager that we are about to set up the
+ * guest page to host page mappings for the specfied VM.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pGVM                The ring-0 VM structure.
+ */
+VMMR0_INT_DECL(int) GPciRawR0GuestPageBeginAssignments(PGVM pGVM)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Assigns a host page mapping for a guest page.
+ *
+ * This is only used when setting up the mappings, i.e. between
+ * GPciRawR0GuestPageBeginAssignments and GPciRawR0GuestPageEndAssignments.
+ *
+ * @returns VBox status code.
+ * @param   pGVM                The ring-0 VM structure.
+ * @param   GCPhys              The address of the guest page (page aligned).
+ * @param   HCPhys              The address of the host page (page aligned).
+ */
+VMMR0_INT_DECL(int) GPciRawR0GuestPageAssign(PGVM pGVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys)
+{
+    AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
+    AssertReturn(!(HCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Indicates that the specified guest page doesn't exists but doesn't have host
+ * page mapping we trust PCI pass-through with.
+ *
+ * This is only used when setting up the mappings, i.e. between
+ * GPciRawR0GuestPageBeginAssignments and GPciRawR0GuestPageEndAssignments.
+ *
+ * @returns VBox status code.
+ * @param   pGVM                The ring-0 VM structure.
+ * @param   GCPhys              The address of the guest page (page aligned).
+ * @param   HCPhys              The address of the host page (page aligned).
+ */
+VMMR0_INT_DECL(int) GPciRawR0GuestPageUnassign(PGVM pGVM, RTGCPHYS GCPhys)
+{
+    AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Tells the global PCI pass-through manager that we have completed setting up
+ * the guest page to host page mappings for the specfied VM.
+ *
+ * This complements GPciRawR0GuestPageBeginAssignments and will be called even
+ * if some page assignment failed.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pGVM                The ring-0 VM structure.
+ */
+VMMR0_INT_DECL(int) GPciRawR0GuestPageEndAssignments(PGVM pGVM)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Tells the global PCI pass-through manager that a guest page mapping has
+ * changed after the initial setup.
+ *
+ * @returns VBox status code.
+ * @param   pGVM                The ring-0 VM structure.
+ * @param   GCPhys              The address of the guest page (page aligned).
+ * @param   HCPhys              The new host page address or NIL_RTHCPHYS if
+ *                              now unassigned.
+ */
+VMMR0_INT_DECL(int) GPciRawR0GuestPageUpdate(PGVM pGVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys)
+{
+    AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_4);
+    AssertReturn(!(HCPhys & PAGE_OFFSET_MASK) || HCPhys == NIL_RTHCPHYS, VERR_INTERNAL_ERROR_4);
+    return VINF_SUCCESS;
+}
+
+#endif /* VBOX_WITH_PCI_PASSTHROUGH */
+
+
+/**
+ * Sets up the IOMMU when raw PCI device is enabled.
+ *
+ * @note    This is a hack that will probably be remodelled and refined later!
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM                 The VM handle.
+ */
+VMMR0_INT_DECL(int) PGMR0PhysSetupIommu(PVM pVM)
+{
+    PGVM pGVM;
+    int rc = GVMMR0ByVM(pVM, &pGVM);
+    if (RT_FAILURE(rc))
+        return rc;
+
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+    if (pVM->pgm.s.fPciPassthrough)
+    {
+        /*
+         * The Simplistic Approach - Enumerate all the pages and call tell the
+         * IOMMU about each of them.
+         */
+        pgmLock(pVM);
+        rc = GPciRawR0GuestPageBeginAssignments(pGVM);
+        if (RT_SUCCESS(rc))
+        {
+            for (PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesR0; RT_SUCCESS(rc) && pRam; pRam = pRam->pNextR0)
+            {
+                PPGMPAGE    pPage  = &pRam->aPages[0];
+                RTGCPHYS    GCPhys = pRam->GCPhys;
+                uint32_t    cLeft  = pRam->cb >> PAGE_SHIFT;
+                while (cLeft-- > 0)
+                {
+                    /* Only expose pages that are 100% safe for now. */
+                    if (   PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM
+                        && PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED
+                        && !PGM_PAGE_HAS_ANY_HANDLERS(pPage))
+                        rc = GPciRawR0GuestPageAssign(pGVM, GCPhys, PGM_PAGE_GET_HCPHYS(pPage));
+                    else
+                        rc = GPciRawR0GuestPageUnassign(pGVM, GCPhys);
+
+                    /* next */
+                    pPage++;
+                    GCPhys += PAGE_SIZE;
+                }
+            }
+
+            int rc2 = GPciRawR0GuestPageEndAssignments(pGVM);
+            if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
+                rc = rc2;
+        }
+        pgmUnlock(pVM);
+    }
+    else
+#endif
+        rc = VERR_NOT_SUPPORTED;
+    return rc;
+}
+
+
 /**
  * #PF Handler for nested paging.

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

@@ -975 +975 @@
             return PGMR0PhysAllocateLargeHandyPage(pVM, &pVM->aCpus[idCpu]);
 
+        case VMMR0_DO_PGM_PHYS_SETUP_IOMMU:
+            if (idCpu != 0)
+                return VERR_INVALID_CPU_ID;
+            return PGMR0PhysSetupIommu(pVM);
+
         /*
          * GMM wrappers.

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

@@ -272 +272 @@
 static DECLCALLBACK(int) hwaccmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
 static int hwaccmR3InitCPU(PVM pVM);
+static int hwaccmR3InitFinalizeR0(PVM pVM);
 static int hwaccmR3TermCPU(PVM pVM);
 
@@ -640 +641 @@
     switch (enmWhat)
     {
-    case VMINITCOMPLETED_RING3:
-        return hwaccmR3InitCPU(pVM);
-    default:
-        return VINF_SUCCESS;
+        case VMINITCOMPLETED_RING3:
+            return hwaccmR3InitCPU(pVM);
+        case VMINITCOMPLETED_RING0:
+            return HWACCMR3InitFinalizeR0(pVM);
+        default:
+            return VINF_SUCCESS;
     }
 }
@@ -686 +689 @@
  * @param   pVM         The VM handle.
  */
-VMMR3DECL(int) HWACCMR3InitFinalizeR0(PVM pVM)
+static int hwaccmR3InitFinalizeR0(PVM pVM)
 {
     int rc;

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

@@ -1276 +1276 @@
         return rc;
     }
+
+    /*
+     * Check for PCI pass-through.
+     */
+    rc = CFGMR3QueryBoolDef(pCfgPGM, "PciPassThrough", &pVM->pgm.s.fPciPassthrough, false);
+    AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"PciPassThrough\", rc=%Rrc.\n", rc), rc);
+    AssertLogRelReturn(!pVM->pgm.s.fPciPassthrough || pVM->pgm.s.fRamPreAlloc, VERR_INVALID_PARAMETER);
 
 #ifdef VBOX_WITH_STATISTICS
@@ -2135 +2142 @@
 
 /**
+ * Init phase completed callback.
+ *
+ * @returns VBox status code.
+ * @param   pVM                 The VM handle.
+ * @param   enmWhat             What has been completed.
+ * @thread  EMT(0)
+ */
+VMMR3_INT_DECL(int) PGMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat)
+{
+    switch (enmWhat)
+    {
+        case VMINITCOMPLETED_HWACCM:
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+            if (pVM->pgm.s.fPciPassthrough)
+            {
+                AssertLogRelReturn(pVM->pgm.s.fRamPreAlloc, VERR_INVALID_PARAMETER);
+                AssertLogRelReturn(HWACCMIsEnabled(pVM), VERR_INVALID_PARAMETER);
+                AssertLogRelReturn(HWACCMIsNestedPagingActive(pVM), VERR_INVALID_PARAMETER);
+
+                /*
+                 * Report assignments to the IOMMU (hope that's good enough for now).
+                 */
+                if (pVM->pgm.s.fPciPassthrough)
+                {
+                    int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_PHYS_SETUP_IOMMU, 0, NULL);
+                    AssertRCReturn(rc, rc);
+                }
+            }
+#else
+            AssertLogRelReturn(!pVM->pgm.s.fPciPassthrough, VERR_INTERNAL_ERROR_5);
+#endif
+            break;
+
+        default:
+            /* shut up gcc */
+            break;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Applies relocations to data and code managed by this component.
  *

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

@@ -1008 +1008 @@
                             PGM_PAGE_SET_FT_DIRTY(pPage);
                         }
-    
+
                         pgmPhysPageWriteMonitor(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT));
                         break;
-    
+
                     case PGM_PAGE_STATE_SHARED:
                         AssertFailed();
                         break;
-    
+
                     case PGM_PAGE_STATE_WRITE_MONITORED:    /* nothing to change. */
                     default:

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

@@ -1032 +1032 @@
     if (RT_SUCCESS(rc))
         rc = vmR3InitDoCompleted(pVM, VMINITCOMPLETED_RING0);
-
-    /** @todo Move this to the VMINITCOMPLETED_RING0 notification handler. */
     if (RT_SUCCESS(rc))
-    {
-        rc = HWACCMR3InitFinalizeR0(pVM);
+        rc = vmR3InitDoCompleted(pVM, VMINITCOMPLETED_HWACCM);
+
+    /** @todo Move this to the VMINITCOMPLETED_HWACCM notification handler. */
+    if (RT_SUCCESS(rc))
         CPUMR3SetHWVirtEx(pVM, HWACCMIsEnabled(pVM));
-    }
 
     LogFlow(("vmR3InitRing0: returns %Rrc\n", rc));
@@ -1089 +1088 @@
     if (RT_SUCCESS(rc))
         rc = HWACCMR3InitCompleted(pVM, enmWhat);
+    if (RT_SUCCESS(rc))
+        rc = PGMR3InitCompleted(pVM, enmWhat);
     return rc;
 }

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

@@ -2914 +2914 @@
      * (Only used in strict builds.) */
     bool                            fNoMorePhysWrites;
+    /** Set if PCI passthrough is enabled. */
+    bool                            fPciPassthrough;
     /** Alignment padding that makes the next member start on a 8 byte boundary. */
-    bool                            afAlignment1[3];
+    bool                            afAlignment1[2];
 
     /** Indicates that PGMR3FinalizeMappings has been called and that further