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

Timestamp:

Apr 5, 2011 4:08:06 PM (14 years ago)

Author:

vboxsync

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

71000

Message:

Runtime/r0drv/solaris: Use kernel pages from free and cachelists.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

@@ -71 +71 @@
 
 /*
+ * We have to use dl_lookup to find kflt_init() and thereby use kernel pages from
+ * the freelists if we no longer get user pages from freelist and cachelists.
+ */
+/* Introduced in v9 */
+static int use_kflt = 0;
+page_t *vbi_page_get_fromlist(uint_t freelist, caddr_t virtAddr);
+
+
+/*
  * Workarounds for running on old versions of solaris with different cross call
  * interfaces. If we find xc_init_cpu() in the kernel, then just use the defined
@@ -243 +252 @@
                 }
         }
+
+        /*
+         * Use kernel page freelist flags to get pages from kernel page freelists
+         * while allocating physical pages, once the userpages are exhausted.
+         * snv_161+, see @bugref{5632}.
+         */
+        if (kobj_getsymvalue("kflt_init", 1) != NULL)
+        {
+                use_kflt = 1;
+        }
+
 
         /*
@@ -1305 +1325 @@
                                  * we don't have the 'virtAddr' to which this memory may be mapped.
                                  */
-                                seg_t kernseg;
-                                kernseg.s_as = &kas;
                                 caddr_t virtAddr = NULL;
                                 for (int64_t i = 0; i < npages; i++, virtAddr += PAGESIZE)
                                 {
-                                        /* get a page from the freelist */
-                                        page_t *ppage = page_get_freelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
-                                                                                PAGESIZE, 0 /* flags */, NULL /* local group */);
+                                        /* get a page from the freelists */
+                                        page_t *ppage = vbi_page_get_fromlist(1 /* freelist */, virtAddr);
                                         if (!ppage)
                                         {
-                                                /* try from the cachelist */
-                                                ppage = page_get_cachelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
-                                                                                0 /* flags */, NULL /* local group */);
+                                                /* try from the cachelists */
+                                                ppage = vbi_page_get_fromlist(2 /* cachelist */, virtAddr);
                                                 if (!ppage)
                                                 {
@@ -1413 +1429 @@
 }
 
+
+/*
+ * This is revision 9 of the interface.
+ */
+page_t *vbi_page_get_fromlist(uint_t freelist, caddr_t virtAddr)
+{
+        seg_t kernseg;
+        kernseg.s_as = &kas;
+        page_t *ppage = NULL;
+        if (freelist == 1)
+        {
+                ppage = page_get_freelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
+                                                        PAGESIZE, 0 /* flags */, NULL /* local group */);
+                if (!ppage)
+                {
+                        if (use_kflt)
+                        {
+                                ppage = page_get_freelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
+                                                        PAGESIZE, 0x0200 /* PG_KFLT */, NULL /* local group */);
+                        }
+                }
+        }
+        else
+        {
+                /* cachelist */
+                ppage = page_get_cachelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
+                                                        0 /* flags */, NULL /* local group */);
+                if (!ppage)
+                {
+                        if (use_kflt)
+                        {
+                                ppage = page_get_cachelist(&vbipagevp, 0 /* offset */, &kernseg, virtAddr,
+                                                        0x0200 /* PG_KFLT */, NULL /* local group */);
+                        }
+                }
+        }
+        return ppage;
+}
+
+
 /*
  * As more functions are added, they should start with a comment indicating
@@ -1418 +1474 @@
  * be increased. Also change vbi_modlmisc at the top of the file.
  */
-uint_t vbi_revision_level = 8;
-
+uint_t vbi_revision_level = 9;
+