Changeset 50779 in vbox for trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c

Timestamp:

Mar 13, 2014 10:54:47 PM (11 years ago)

Author:

vboxsync

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

92799

Message:

vboxpci: current code never calls unmap method, so we end up leaking
mappings and keeping resources busy. To hack around this, map
resources only once and return existing mapping on repeated requests,
free them at once in vboxPciOsDevDeinit().

This makes it possible for the host driver to take back control of the
device after VM terminates.

File:

• trunk/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c (modified) (4 diffs)

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

@@ -652 +652 @@
     if (pPciDev)
     {
+        int iRegion;
+        for (iRegion = 0; iRegion < 7; ++iRegion)
+        {
+            if (pIns->aRegionR0Mapping[iRegion])
+            {
+                iounmap(pIns->aRegionR0Mapping[iRegion]);
+                pIns->aRegionR0Mapping[iRegion] = 0;
+                pci_release_region(pPciDev, iRegion);
+            }
+        }
+
         vboxPciOsDevUnregisterWithIommu(pIns);
 
@@ -738 +749 @@
 {
     struct pci_dev  *pPciDev = pIns->pPciDev;
-    struct resource *pRegion;
     RTR0PTR          result = 0;
+    int              error;
 
     printk(KERN_DEBUG "linux vboxPciOsDevMapRegion: reg=%d start=%llx size=%lld\n", iRegion, RegionStart, u64RegionSize);
 
     if (!pPciDev)
-        return 0;
+        return VERR_INVALID_PARAMETER;
 
     if (iRegion < 0 || iRegion > 6)
@@ -752 +763 @@
     }
 
-    pRegion = request_mem_region(RegionStart, u64RegionSize, "vboxpci");
-    if (!pRegion)
-    {
-        /** @todo: need to make sure if thise error indeed can be ignored. */
-        printk(KERN_DEBUG "request_mem_region() failed, don't care\n");
-    }
+    if (pci_resource_flags(pPciDev, iRegion) & IORESOURCE_IO)
+        return VERR_INVALID_PARAMETER;
+
+    if (RegionStart != pci_resource_start(pPciDev, iRegion))
+        return VERR_INVALID_PARAMETER;
+
+    if (u64RegionSize != pci_resource_len(pPciDev, iRegion))
+        return VERR_INVALID_PARAMETER;
+
+    /*
+     * XXX: Current code never calls unmap.  To avoid leaking mappings
+     * only request and map resources once.
+     */
+    if (pIns->aRegionR0Mapping[iRegion])
+    {
+        *pRegionBase = pIns->aRegionR0Mapping[iRegion];
+        return VINF_SUCCESS;
+    }
+
+
+    error = pci_request_region(pPciDev, iRegion, "vboxpci");
+    if (error)
+        return VERR_RESOURCE_BUSY;
 
     /* For now no caching, try to optimize later. */
-    result = ioremap_nocache(RegionStart, u64RegionSize);
+    result = ioremap_nocache(pci_resource_start(pPciDev, iRegion),
+                             pci_resource_len(pPciDev, iRegion));
 
     if (!result)
     {
         printk(KERN_DEBUG "cannot ioremap_nocache\n");
-        if (pRegion)
-            release_mem_region(RegionStart, u64RegionSize);
-        return 0;
-    }
-
-    *pRegionBase = result;
-
-    return 0;
+        pci_release_region(pPciDev, iRegion);
+        return VERR_MAP_FAILED;
+    }
+
+    *pRegionBase = pIns->aRegionR0Mapping[iRegion] = result;
+
+    return VINF_SUCCESS;
 }
 
@@ -781 +809 @@
                              RTR0PTR        RegionBase)
 {
-
-    iounmap(RegionBase);
-    release_mem_region(RegionStart, u64RegionSize);
-
-    return VINF_SUCCESS;
+    /* XXX: Current code never calls unmap. */
+    return VERR_NOT_IMPLEMENTED;
 }