Changeset 41682 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Jun 13, 2012 12:52:01 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: Query PG_NORELOC support for large pages.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• initterm-r0drv-solaris.c (modified) (3 diffs)
• memobj-r0drv-solaris.c (modified) (4 diffs)
• the-solaris-kernel.h (modified) (1 diff)

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

@@ -154 +154 @@
             else if (max_cpuid + 1 != IPRT_SOL_NCPUS)
             {
-                cmn_err(CE_NOTE, "rtR0InitNative: cpuset_t size mismatch! max_cpuid=%d IPRT_SOL_NCPUS=%d\n", max_cpuid, IPRT_SOL_NCPUS);
+                cmn_err(CE_NOTE, "rtR0InitNative: cpuset_t size mismatch! max_cpuid=%d IPRT_SOL_NCPUS=%d\n", max_cpuid,
+                        IPRT_SOL_NCPUS);
                 rc = VERR_NOT_SUPPORTED;
                 goto errorbail;
@@ -163 +164 @@
          * Optional: Timeout hooks.
          */
-        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "timeout_generic", (void **)&g_pfnrtR0Sol_timeout_generic);
-        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "untimeout_generic", (void **)&g_pfnrtR0Sol_untimeout_generic);
+        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "timeout_generic",
+                                   (void **)&g_pfnrtR0Sol_timeout_generic);
+        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "untimeout_generic",
+                                   (void **)&g_pfnrtR0Sol_untimeout_generic);
         if ((g_pfnrtR0Sol_timeout_generic == NULL) != (g_pfnrtR0Sol_untimeout_generic == NULL))
         {
@@ -173 +176 @@
             g_pfnrtR0Sol_untimeout_generic = NULL;
         }
-        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "cyclic_reprogram", (void **)&g_pfnrtR0Sol_cyclic_reprogram);
+        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "cyclic_reprogram",
+                                   (void **)&g_pfnrtR0Sol_cyclic_reprogram);
+
+        /*
+         * Optional: Querying page no-relocation support.
+         */
+        RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /*pszModule */, "page_noreloc_supported",
+                                   (void **)&g_pfnrtR0Sol_page_noreloc_supported);
 
         /*

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

@@ -84 +84 @@
 static kmutex_t                 g_LargePageOffsetMtx;
 static u_offset_t               g_offLargePage;
+static bool                     g_fLargePageNoReloc;
 
 
@@ -291 +292 @@
 {
     /*
+     * Check PG_NORELOC support for large pages. Using this helps prevent _1G page
+     * fragementation on systems that support it.
+     */
+    static bool fPageNoRelocChecked = false;
+    if (fPageNoRelocChecked == false)
+    {
+        fPageNoRelocChecked = true;
+        g_fLargePageNoReloc = false;
+        if (   g_pfnrtR0Sol_page_noreloc_supported
+            && g_pfnrtR0Sol_page_noreloc_supported(cbLargePage))
+        {
+            g_fLargePageNoReloc = true;
+        }
+    }
+
+    /*
      * Non-pageable memory reservation request for _4K pages, don't sleep.
      */
@@ -311 +328 @@
             KernelSeg.s_as = &kas;
             page_t *pRootPage = page_create_va_large(&g_LargePageVnode, offPage, cbLargePage,
-                                                     PG_EXCL, &KernelSeg, 0 /* vaddr */, NULL /* locality group */);
+                                                     PG_EXCL | (g_fLargePageNoReloc ? PG_NORELOC : 0), &KernelSeg,
+                                                     0 /* vaddr */,NULL /* locality group */);
             if (pRootPage)
             {
@@ -399 +417 @@
             AssertRelease(pFoundPage);
 
-#if 0
-            /*
-             * This can only be guaranteed if PG_NORELOC is used while allocating the pages.
-             */
-            AssertReleaseMsg(pFoundPage == pPage,
+            if (g_fLargePageNoReloc)
+            {
+                /*
+                 * This can only be guaranteed if PG_NORELOC is used while allocating the pages.
+                 */
+                AssertReleaseMsg(pFoundPage == pPage,
                              ("lookup failed %p:%llu returned %p, expected %p\n", &g_LargePageVnode, offPage,
                               pFoundPage, pPage));
-#endif
+            }
 
             /*

trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

@@ -82 +82 @@
 typedef int          (*PFNSOL_cyclic_reprogram)(cyclic_id_t id, hrtime_t expiration);
 typedef void         (*PFNSOL_contig_free)(void *addr, size_t size);
+typedef int          (*PFNSOL_page_noreloc_supported)(size_t cbPageSize);
 
 /* IPRT globals. */
-extern bool                     g_frtSolSplSetsEIF;
-extern RTCPUSET                 g_rtMpSolCpuSet;
-extern PFNSOL_timeout_generic   g_pfnrtR0Sol_timeout_generic;
-extern PFNSOL_untimeout_generic g_pfnrtR0Sol_untimeout_generic;
-extern PFNSOL_cyclic_reprogram  g_pfnrtR0Sol_cyclic_reprogram;
-extern PFNSOL_contig_free       g_pfnrtR0Sol_contig_free;
-extern bool                     g_frtSolUseKflt;
-extern size_t                   g_offrtSolThreadPreempt;
-extern size_t                   g_offrtSolCpuPreempt;
-extern size_t                   g_offrtSolCpuForceKernelPreempt;
-extern bool                     g_frtSolInitDone;
-extern RTDBGKRNLINFO            g_hKrnlDbgInfo;
+extern bool                            g_frtSolSplSetsEIF;
+extern RTCPUSET                        g_rtMpSolCpuSet;
+extern PFNSOL_timeout_generic          g_pfnrtR0Sol_timeout_generic;
+extern PFNSOL_untimeout_generic        g_pfnrtR0Sol_untimeout_generic;
+extern PFNSOL_cyclic_reprogram         g_pfnrtR0Sol_cyclic_reprogram;
+extern PFNSOL_contig_free              g_pfnrtR0Sol_contig_free;
+extern PFNSOL_page_noreloc_supported   g_pfnrtR0Sol_page_noreloc_supported;
+extern size_t                          g_offrtSolThreadPreempt;
+extern size_t                          g_offrtSolCpuPreempt;
+extern size_t                          g_offrtSolCpuForceKernelPreempt;
+extern bool                            g_frtSolInitDone;
+extern RTDBGKRNLINFO                   g_hKrnlDbgInfo;
 
 /*