Changeset 88215 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Mar 19, 2021 6:42:55 PM (4 years ago)

Author:

vboxsync

Message:

Solaris-specific changes needed for building VBox on Solaris 11.4.
ticketref:9956

/Config.kmk,tools/Makefile.kmk: The Solaris package FMRI changed in
Solaris 11.4 so further care is needed when parsing the 'pkg contents -o
pkg.fmri' output. Some further simplification done as well as only the
Solaris 11 update and build number are needed for feature checking
elsewhere.

Additions/solaris/DRM: In Solaris 11 FCS <sys/queue.h> was taken from
FreeBSD and added to the OS. VirtualBox copied this file to
Additions/solaris/DRM/include and it is included by
Additions/solaris/DRM/include/drmP.h. Solaris 11.4 modified <sys/modctl.h>
to include <sys/queue.h> and drmP.h includes <sys/modctl.h> so thus
drmP.h shouldn't include queue.h on Solaris 11.4 FCS and later.

Additions/solaris/SharedFolders,Runtime/r0drv/solaris: Solaris 11.4
removed the 'alignment' argument from the VM map_addr() and
choose_addr() routines so we now leverage RTR0DbgKrnlInfoQuerySymbol()
at module initialization to determine which version of these functions
needs to be invoked.

Runtime/r0drv/solaris: In Solaris 11.4 the VM seg_ops getpolicy()
routine changed its return value and added an extra argument but since
we don't need to do anything for this and Solaris 10 and 11 both check
for a non-NULL s_ops->getpolicy() entry or else for s_ops->capable()
before calling getpolicy() we just set the s_SegVBoxOps getpolicy()
entry to NULL. Solaris 11.4 also added an extra argument to the VM
seg_ops dump() routine but there aren't any checks made before calling
it. Since we don't do anything with dump() we just use #ifdefs to get
the correct prototype at build-time.

Additions/x11/vboxvideo: The Xorg vboxvideo_drv.so shared object on
Solaris 11.4 has an undefined weak symbol reference to assert_c99
which needs to be added to the undefined_xorg file.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

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

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

@@ -85 +85 @@
 /** Host scheduler force preemption offset. */
 size_t                          g_offrtSolCpuForceKernelPreempt;
+/** Whether to use the old-style map_addr() routine. */
+bool                            g_frtSolOldMapAddr = false;
+/** The map_addr() hooks callout table structure. */
+RTR0FNSOLMAPADDR                g_rtSolMapAddr;
 /* Resolve using dl_lookup (remove if no longer relevant for supported S10 versions) */
 extern void contig_free(void *addr, size_t size);
@@ -223 +227 @@
 
         /*
+         * Mandatory: map_addr() hooks.
+         */
+        rc = RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "plat_map_align_amount",  NULL /* ppvSymbol */);
+        if (RT_SUCCESS(rc))
+        {
+            g_rtSolMapAddr.u.pfnSol_map_addr    = (void *)map_addr;
+        }
+        else
+        {
+            g_frtSolOldMapAddr = true;
+            g_rtSolMapAddr.u.pfnSol_map_addr_old    = (void *)map_addr;
+        }
+
+        /*
          * Optional: Timeout hooks.
          */

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

@@ -578 +578 @@
 
     as_rangelock(pAddrSpace);
-    map_addr(pVirtAddr, cb, 0 /* offset */, 0 /* vacalign */, MAP_SHARED);
+    if (g_frtSolOldMapAddr)
+        g_rtSolMapAddr.u.pfnSol_map_addr_old(pVirtAddr, cb, 0 /* offset */, 0 /* vacalign */, MAP_SHARED);
+    else
+        g_rtSolMapAddr.u.pfnSol_map_addr(pVirtAddr, cb, 0 /* offset */, MAP_SHARED);
     if (*pVirtAddr != NULL)
         rc = as_map(pAddrSpace, *pVirtAddr, cb, rtR0SegVBoxSolCreate, &Args);
@@ -1053 +1056 @@
             page_t **papPages = pMemToMapSolaris->pvHandle;
             AssertPtr(papPages);
-            papPages += offSub >> PAGE_SIZE;
+            papPages += offSub >> PAGE_SHIFT;
             for (size_t iPage = 0; iPage < cPages; iPage++)
                 paPhysAddrs[iPage] = rtR0MemObjSolPagePhys(papPages[iPage]);

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

@@ -258 +258 @@
 
 
+#if defined(VBOX_NEW_CRASH_DUMP_FORMAT)
+static void rtR0SegVBoxSolDump(seg_t *pSeg, dump_addpage_f Func)
+#else
 static void rtR0SegVBoxSolDump(seg_t *pSeg)
+#endif
 {
     /* Nothing to do. */
@@ -279 +283 @@
 {
     return ENODEV;
-}
-
-
-static lgrp_mem_policy_info_t *rtR0SegVBoxSolGetPolicy(seg_t *pSeg, caddr_t virtAddr)
-{
-    return NULL;
 }
 
@@ -317 +315 @@
     rtR0SegVBoxSolSetPageSize,
     rtR0SegVBoxSolGetMemId,
-    rtR0SegVBoxSolGetPolicy,
+    NULL,                       /* getpolicy() */
     rtR0SegVBoxSolCapable
 };

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

@@ -203 +203 @@
 extern bool                     g_frtSolOldThreadCtx;
 
+/*
+ * Workaround for older Solaris versions which called map_addr()/choose_addr()/
+ * map_addr_proc() with an 'alignment' argument that was removed in Solaris
+ * 11.4.
+ */
+typedef struct RTR0FNSOLMAPADDR
+{
+    union
+    {
+        void *(*pfnSol_map_addr)          (caddr_t *, size_t, offset_t, uint_t);
+        void *(*pfnSol_map_addr_old)      (caddr_t *, size_t, offset_t, int, uint_t);
+    } u;
+} RTR0FNSOLMAPADDR;
+typedef RTR0FNSOLMAPADDR *PRTR0FNSOLMAPADDR;
+
+extern RTR0FNSOLMAPADDR         g_rtSolMapAddr;
+extern bool                     g_frtSolOldMapAddr;
+
 /* Solaris globals. */
 extern uintptr_t                kernelbase;