Changeset 36448 in vbox

Timestamp:

Mar 28, 2011 12:37:43 PM (14 years ago)

Author:

vboxsync

Message:

PCI: refactoring, further IOMMU work

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (7 diffs)
• include/VBox/vmm/gvm.h (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (6 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/PGMR0.cpp (modified) (4 diffs)

trunk/include/VBox/rawpci.h

@@ -50 +50 @@
 } PCIRAWMEMINFOACTION;
 
+/**
+ * Per-VM capability flag bits.
+ */
+typedef enum PCIRAWVMFLAGS
+{
+    /** If we can use IOMMU in this VM. */
+    PCIRAW_VMFLAGS_HAS_IOMMU = (1 << 0),
+    PCIRAW_VMFLAGS_32BIT_HACK = 0x7fffffff
+} PCIRAWVMFLAGS;
+
 /* Forward declaration. */
-struct RAWPCIVM;
+struct RAWPCIPERVM;
 
 /**
@@ -69 +79 @@
  * @param   Action        Action performed (i.e. if page was mapped or unmapped).
  */
-typedef DECLCALLBACK(int) FNRAWPCICONTIGPHYSMEMINFO(struct RAWPCIVM* pVmData, RTHCPHYS HostStart, RTGCPHYS GuestStart, uint64_t cMemSize, PCIRAWMEMINFOACTION Action);
+typedef DECLCALLBACK(int) FNRAWPCICONTIGPHYSMEMINFO(struct RAWPCIPERVM* pVmData, RTHCPHYS HostStart, RTGCPHYS GuestStart, uint64_t cMemSize, PCIRAWMEMINFOACTION Action);
 typedef FNRAWPCICONTIGPHYSMEMINFO *PFNRAWPCICONTIGPHYSMEMINFO;
 
 /** Data being part of the VM structure. */
-typedef struct RAWPCIVM
+typedef struct RAWPCIPERVM
 {
     /** Shall only be interpreted by the host PCI driver. */
@@ -79 +89 @@
     /** Callback called when mapping of host pages to the guest changes. */
     PFNRAWPCICONTIGPHYSMEMINFO  pfnContigMemInfo;
-} RAWPCIVM;
-typedef RAWPCIVM *PRAWPCIVM;
+    /** Flags describing VM capabilities (such as IOMMU presence). */
+    uint32_t                    fVmCaps;
+} RAWPCIPERVM;
+typedef RAWPCIPERVM *PRAWPCIPERVM;
 
 /** Parameters buffer for PCIRAWR0_DO_OPEN_DEVICE call */
@@ -90 +102 @@
     /* out */
     PCIRAWDEVHANDLE Device;
+    uint32_t        fDevFlags;
 } PCIRAWREQOPENDEVICE;
 
@@ -496 +509 @@
                                                    uint32_t             u32HostAddress,
                                                    uint32_t             fFlags,
-                                                   PRAWPCIVM            pVmCtx,
-                                                   PRAWPCIDEVPORT       *ppDevPort));
+                                                   PRAWPCIPERVM         pVmCtx,
+                                                   PRAWPCIDEVPORT       *ppDevPort,
+                                                   uint32_t             *pfDevFlags));
 
 
@@ -511 +525 @@
     DECLR0CALLBACKMEMBER(int, pfnInitVm,(PRAWPCIFACTORY       pFactory,
                                          PVM                  pVM,
-                                         PRAWPCIVM            pPciData));
+                                         PRAWPCIPERVM         pPciData));
 
     /**
@@ -524 +538 @@
     DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY       pFactory,
                                             PVM                  pVM,
-                                            PRAWPCIVM            pPciData));
+                                            PRAWPCIPERVM         pPciData));
 } RAWPCIFACTORY;
 

trunk/include/VBox/vmm/gvm.h

@@ -102 +102 @@
         uint8_t             padding[256];
     } gmm;
+    
+    /** The RAWPCIVM per vm data. */
+    union
+    {
+#ifdef ___VBox_rawpci_h
+        struct RAWPCIPERVM s;
+#endif
+        uint8_t     padding[64];
+    } rawpci;
+
 
     /** GVMCPU array for the configured number of virtual CPUs. */

trunk/include/VBox/vmm/vm.h

@@ -1013 +1013 @@
     } cfgm;
 
-    /** RAWPCIVM part. */
-    union
-    {
-#ifdef ___VBox_rawpci_h
-        struct RAWPCIVM s;
-#endif
-        uint8_t     padding[64];         /* multiple of 8 */
-    } rawpci;
 
     /** Padding for aligning the cpu array on a page boundary. */
-    uint8_t         abAlignment2[1438];
+    uint8_t         abAlignment2[1502];
 
     /* ---- end small stuff ---- */

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

@@ -409 +409 @@
                               uint32_t           u32HostAddress,
                               uint32_t           fFlags,
-                              PRAWPCIVM          pVmCtx,
-                              PRAWPCIDEVPORT     *ppDevPort)
+                              PRAWPCIPERVM       pVmCtx,
+                              PRAWPCIDEVPORT     *ppDevPort,
+                              uint32_t           *pfDevFlags)
 {
     int             rc;
@@ -476 +477 @@
                                                         uint32_t             u32HostAddress,
                                                         uint32_t             fFlags,
-                                                        PRAWPCIVM            pVmCtx,
-                                                        PRAWPCIDEVPORT       *ppDevPort)
+                                                        PRAWPCIPERVM         pVmCtx,
+                                                        PRAWPCIDEVPORT       *ppDevPort,
+                                                        uint32_t             *pfDevFlags)
 {
     PVBOXRAWPCIGLOBALS pGlobals = (PVBOXRAWPCIGLOBALS)((uint8_t *)pFactory - RT_OFFSETOF(VBOXRAWPCIGLOBALS, RawPciFactory));
@@ -496 +498 @@
     }
 
-    rc = vboxPciNewInstance(pGlobals, u32HostAddress, fFlags, pVmCtx, ppDevPort);
+    rc = vboxPciNewInstance(pGlobals, u32HostAddress, fFlags, pVmCtx, ppDevPort, pfDevFlags);
 
 unlock:
@@ -521 +523 @@
 static DECLCALLBACK(int)  vboxPciFactoryInitVm(PRAWPCIFACTORY       pFactory,
                                                PVM                  pVM,
-                                               PRAWPCIVM            pVmData)
+                                               PRAWPCIPERVM         pVmData)
 {
     PVBOXRAWPCIDRVVM pThis = (PVBOXRAWPCIDRVVM)RTMemAllocZ(sizeof(VBOXRAWPCIDRVVM));
@@ -533 +535 @@
     {
         rc = vboxPciOsInitVm(pThis, pVM, pVmData);
-#ifdef VBOX_WITH_IOMMU
-        /* If IOMMU notification routine in pVmData->pfnContigMemInfo
-           is not set - we have no IOMMU hardware. */
-#endif
 
         if (RT_SUCCESS(rc))
         {
+#ifdef VBOX_WITH_IOMMU
+            /* If IOMMU notification routine in pVmData->pfnContigMemInfo
+               is set - we have functional IOMMU hardware. */
+            if (pVmData->pfnContigMemInfo)
+                pVmData->fVmCaps |= PCIRAW_VMFLAGS_HAS_IOMMU;
+#endif
             pVmData->pDriverData = pThis;
             return VINF_SUCCESS;
@@ -557 +561 @@
 static DECLCALLBACK(void)  vboxPciFactoryDeinitVm(PRAWPCIFACTORY       pFactory,
                                                   PVM                  pVM,
-                                                  PRAWPCIVM            pPciData)
+                                                  PRAWPCIPERVM         pPciData)
 {
     if (pPciData->pDriverData)

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

@@ -86 +86 @@
     void              *pIrqContext;
 
-    PRAWPCIVM         pVmCtx;
+    PRAWPCIPERVM       pVmCtx;
 } VBOXRAWPCIINS;
 
@@ -139 +139 @@
 DECLHIDDEN(void) vboxPciShutdown(PVBOXRAWPCIGLOBALS pGlobals);
 
-DECLHIDDEN(int)  vboxPciOsInitVm(PVBOXRAWPCIDRVVM pThis,   PVM pVM, PRAWPCIVM pVmData);
+DECLHIDDEN(int)  vboxPciOsInitVm(PVBOXRAWPCIDRVVM pThis,   PVM pVM, PRAWPCIPERVM pVmData);
 DECLHIDDEN(void) vboxPciOsDeinitVm(PVBOXRAWPCIDRVVM pThis, PVM pVM);
 

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

@@ -20 +20 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_PGM
+#include <VBox/rawpci.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/gmm.h>
+#include <VBox/vmm/gvm.h>
 #include "PGMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -194 +196 @@
    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',
+   passing pGVM here.  I've tentitively prefixed the functions 'GPciRawR0',
    we can discuss the PciRaw code re-organtization when I'm back from
    vacation.
@@ -235 +237 @@
     AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
     AssertReturn(!(HCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
+
+    if (pGVM->rawpci.s.pfnContigMemInfo)
+        /** @todo: what do we do on failure? */
+        pGVM->rawpci.s.pfnContigMemInfo(&pGVM->rawpci.s, HCPhys, GCPhys, PAGE_SIZE, PCIRAW_MEMINFO_MAP);
+
     return VINF_SUCCESS;
 }
@@ -254 +261 @@
 {
     AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), VERR_INTERNAL_ERROR_3);
+
+    if (pGVM->rawpci.s.pfnContigMemInfo)
+        /** @todo: what do we do on failure? */
+        pGVM->rawpci.s.pfnContigMemInfo(&pGVM->rawpci.s, 0, GCPhys, PAGE_SIZE, PCIRAW_MEMINFO_UNMAP);
+
     return VINF_SUCCESS;
 }