Changeset 41081 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 27, 2012 12:06:14 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: implemented honoring upper physical limit in rtR0MemObjNativeAllocPhysNC.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c

@@ -181 +181 @@
 static page_t **rtR0MemObjSolPagesAlloc(uint64_t uPhysHi, uint64_t *puPhys, size_t cb)
 {
-    /** @todo We need to satisfy the upper physical address constraint */
-
     /*
      * The page freelist and cachelist both hold pages that are not mapped into any address space.
@@ -208 +206 @@
                 for (size_t i = 0; i < cPages; i++, virtAddr += PAGESIZE)
                 {
-                    /*
-                     * Get a page from the freelist or cachelist.
-                     */
-                    page_t *pPage = rtR0MemObjSolPageFromFreelist(virtAddr, PAGESIZE);
-                    if (!pPage)
+                    uint32_t cTries = 3;
+                    page_t *pPage   = NULL;
+                    while (cTries > 0)
                     {
-                        pPage = rtR0MemObjSolPageFromCachelist(virtAddr, PAGESIZE);
-                        if (RT_UNLIKELY(!pPage))
+                        /*
+                         * Get a page from the freelist or cachelist & verify if it's within our
+                         * requested range.
+                         */
+                        pPage = rtR0MemObjSolPageFromFreelist(virtAddr, PAGESIZE);
+                        if (!pPage)
                         {
-                            /*
-                             * No more pages found, release was grabbed so far.
-                             */
-                            page_create_putback(cPages - i);
-                            while (--i >= 0)
-                                page_free(ppPages[i], 0 /* don't need page, move to tail of pagelist */);
-                            kmem_free(ppPages, cbPages);
-                            page_unresv(cPages);
-                            return NULL;
+                            pPage = rtR0MemObjSolPageFromCachelist(virtAddr, PAGESIZE);
+                            if (RT_UNLIKELY(!pPage))
+                                break;
                         }
+                        if (uPhysHi != NIL_RTHCPHYS)
+                        {
+                            uint64_t uPhys = rtR0MemObjSolPagePhys(pPage);
+                            if (uPhys > uPhysHi)
+                            {
+                                page_free(pPage, 0 /* don't need page, move to tail of pagelist */);
+                                pPage = NULL;
+                                --cTries;
+                                continue;
+                            }
+                        }
+
+                        PP_CLRFREE(pPage);      /* Page is no longer free */
+                        PP_CLRAGED(pPage);      /* Page is not hashed in */
+                        ppPages[i] = pPage;
+                        break;
                     }
 
-                    PP_CLRFREE(pPage);      /* Page is no longer free */
-                    PP_CLRAGED(pPage);      /* Page is not hashed in */
-                    ppPages[i] = pPage;
+                    if (RT_UNLIKELY(!pPage))
+                    {
+                        /*
+                         * No pages found or found pages didn't meet requirements, release what was grabbed so far.
+                         */
+                        page_create_putback(cPages - i);
+                        while (--i >= 0)
+                            page_free(ppPages[i], 0 /* don't need page, move to tail of pagelist */);
+                        kmem_free(ppPages, cbPages);
+                        page_unresv(cPages);
+                        return NULL;
+                    }
                 }
 
@@ -273 +292 @@
         /*
          * Prepare pages for mapping into kernel/user-space. Downgrade the
-         * exclusive page lock to a shared lock if necessary.
+         * exclusive page lock to a shared lock to prevent page relocation.
          */
         if (page_tryupgrade(ppPages[iPage]) == 1)
@@ -407 +426 @@
     /*
      * We need to downgrade the sub-pages from exclusive to shared locking
-     * because otherweise we cannot <you go figure>.
+     * to prevent page relocation.
      */
     for (pgcnt_t iPage = 0; iPage < cPages; iPage++)