Changeset 36400 in vbox

Timestamp:

Mar 24, 2011 1:14:26 PM (14 years ago)

Author:

vboxsync

Message:

PCI: work on IOMMU notifications

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/rawpci.h

@@ -27 +27 @@
 #define ___VBox_rawpci_h
 
-#include <iprt/types.h>
+#include <VBox/types.h>
+#include <VBox/sup.h>
 
 RT_C_DECLS_BEGIN
@@ -35 +36 @@
  */
 typedef uint32_t PCIRAWDEVHANDLE;
+
+/**
+ * Physical memory action enumeration.
+ */
+typedef enum PCIRAWMEMINFOACTION
+{
+    /* Pages mapped. */
+    PCIRAW_MEMINFO_MAP,
+    /* Pages unmapped. */
+    PCIRAW_MEMINFO_UNMAP,
+    /** The usual 32-bit type blow up. */
+    PCIRAW_MEMINFO_32BIT_HACK = 0x7fffffff
+} PCIRAWMEMINFOACTION;
+
+/**
+ * Callback to notify raw PCI subsystem about mapping/unmapping of
+ * host pages to the guest. Typical usecase is to register physical
+ * RAM pages with IOMMU, so that it could allow DMA for PCI devices
+ * directly from the guest RAM.
+ * Region shall be one or more contigous (both host and guest) pages 
+ * of physical memory.  
+ * 
+ * @param   pVM           VM pointer.
+ * @param   HostStart     Physical address of region start on the host.  
+ * @param   GuestStart    Physical address of region start on the guest.
+ * @param   cMemSize      Region size in bytes.
+ * @param   Action        Action performed.
+
+ */
+typedef DECLCALLBACK(void) FNRAWPCICONTIGPHYSMEMINFO(PVM pVM, RTHCPHYS HostStart, RTGCPHYS GuestStart, uint64_t cMemSize, PCIRAWMEMINFOACTION Action);
+typedef FNRAWPCICONTIGPHYSMEMINFO *PFNRAWPCICONTIGPHYSMEMINFO;
 
 /** Data being part of the VM structure. */
@@ -40 +72 @@
 {
     /* Shall only be interpreted by the host PCI driver. */
-    RTR0PTR  pDriverData;
+    RTR0PTR                     pDriverData;
+    /* Callback called when mapping of host pages to the guest changes. */
+    PFNRAWPCICONTIGPHYSMEMINFO  pfnContigMemInfo;
 } RAWPCIVM;
 typedef RAWPCIVM *PRAWPCIVM;

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -83 +83 @@
 
 DECLINLINE(void) vboxPciDevUnlock(PVBOXRAWPCIINS pThis)
+{
+    RTSemFastMutexRelease(pThis->hFastMtx);
+}
+
+DECLINLINE(int) vboxPciVmLock(PVBOXRAWPCIDRVVM pThis)
+{
+    int rc = RTSemFastMutexRequest(pThis->hFastMtx);
+    AssertRC(rc);
+    return rc;
+}
+
+DECLINLINE(void) vboxPciVmUnlock(PVBOXRAWPCIDRVVM pThis)
 {
     RTSemFastMutexRelease(pThis->hFastMtx);
@@ -380 +392 @@
 
     rc = vboxPciOsDevPowerStateChange(pThis, aState);
-    
+
     vboxPciDevUnlock(pThis);
 

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -100 +100 @@
 #ifdef RT_OS_LINUX
 # ifdef VBOX_WITH_IOMMU
-    struct iommu_domain* iommu_domain;
+    struct iommu_domain* pIommuDomain;
 # endif
 #endif
+    int32_t        fFlags;
 } VBOXRAWPCIDRVVM;
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -509 +509 @@
 
     if (assignments.size() > 0)
+    {
         InsertConfigNode(pDevices,     "pciraw",  &pPciDevs);
+
+        /*
+         * Currently, using IOMMU needed for PCI passthrough
+         * requires RAM preallocation.
+         * @todo: check if we can lift this requirement
+         */
+        PCFGMNODE pRoot = CFGMR3GetParent(pDevices);
+        Assert(pRoot);
+        CFGMR3RemoveValue(pRoot, "RamPreAlloc");
+        CFGMR3InsertInteger(pRoot, "RamPreAlloc",    1);
+    }
 
     for (size_t iDev = 0; iDev < assignments.size(); iDev++)

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

@@ -151 +151 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GMM
+#include <VBox/rawpci.h>
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/gmm.h>
@@ -2092 +2093 @@
                                     pPage->Private.pfn = GMM_PAGE_PFN_UNSHAREABLE;
                                 /* else: NIL_RTHCPHYS nothing */
+#if 0
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+                                if (pVM->rawpci.s.pfnContigMemInfo)
+                                    pVM->rawpci.s.pfnContigMemInfo(pVM, paPages[iPage].HCPhysGCPhys, 0, PAGE_SIZE, PCIRAW_MEMINFO_MAP);
+#endif
+#endif
 
                                 paPages[iPage].idPage = NIL_GMM_PAGEID;