Changeset 88215 in vbox for trunk/src/VBox/Additions/solaris

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/Additions/solaris

Files:

• DRM/Makefile.kmk (modified) (1 diff)
• DRM/include/drmP.h (modified) (1 diff)
• SharedFolders/Makefile.kmk (modified) (1 diff)
• SharedFolders/vboxfs_vfs.c (modified) (4 diffs)
• SharedFolders/vboxfs_vfs.h (modified) (1 diff)
• SharedFolders/vboxfs_vnode.c (modified) (2 diffs)

trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk

@@ -40 +40 @@
 vboxvideo_DEFS          = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV)
 vboxvideo_DEPS         += $(VBOX_SVN_REV_KMK)
+if ($(VBOX_SOLARIS_11_UPDATE_VERSION) > 3)
+vboxvideo_DEFS         += VBOX_WITH_SYSTEM_QUEUE_H
+endif
 vboxvideo_INCS         := \
         include/

trunk/src/VBox/Additions/solaris/DRM/include/drmP.h

@@ -58 +58 @@
 #include "drm_atomic.h"
 #include "drm.h"
-#include "queue.h"
+#if !defined(VBOX_WITH_SYSTEM_QUEUE_H)
+# include "queue.h"
+#endif
 #include "drm_linux_list.h"
 

trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

@@ -53 +53 @@
  vboxfs_deps.asm_ASFLAGS   = -f bin -g null
 endif
-if $(VBOX_SOLARIS_11_VERSION) > 175 \
- || (   $(VBOX_SOLARIS_11_VERSION) == 175 \
-     && (   $(VBOX_SOLARIS_11_UPDATE_VERSION) > 1 \
-         || ($(VBOX_SOLARIS_11_UPDATE_VERSION) == 1 && $(VBOX_SOLARIS_11_BUILD_VERSION) >= 10) ) )
+if  ($(VBOX_SOLARIS_11_UPDATE_VERSION) > 1 \
+ || ($(VBOX_SOLARIS_11_UPDATE_VERSION) == 1 && $(VBOX_SOLARIS_11_BUILD_VERSION) >= 10))
 vboxfs_DEFS         += VBOX_VFS_EXTENDED_POLICY
 endif

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c

@@ -27 +27 @@
 #include <VBox/log.h>
 #include <VBox/version.h>
+#include <iprt/dbg.h>
 
 #include <sys/types.h>
@@ -44 +45 @@
 #include <sys/pathname.h>
 #include <sys/cmn_err.h>
+#include <sys/vmsystm.h>
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
@@ -104 +106 @@
 int sffs_minor;         /* minor number for device */
 
+/** Whether to use the old-style map_addr()/choose_addr() routines. */
+bool                     g_fVBoxVFS_SolOldAddrMap;
+/** The map_addr()/choose_addr() hooks callout table structure. */
+VBoxVFS_SolAddrMap       g_VBoxVFS_SolAddrMap;
+
 /*
  * Module linkage information
@@ -122 +129 @@
 _init()
 {
+    RTDBGKRNLINFO hKrnlDbgInfo;
+    int rc = RTR0DbgKrnlInfoOpen(&hKrnlDbgInfo, 0 /* fFlags */);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlDbgInfo, NULL /* pszModule */, "plat_map_align_amount",  NULL /* ppvSymbol */);
+        if (RT_SUCCESS(rc))
+        {
+#if defined(VBOX_VFS_SOLARIS_10U6)
+            g_VBoxVFS_SolAddrMap.MapAddr.pfnSol_map_addr    = (void *)map_addr;
+#else
+            g_VBoxVFS_SolAddrMap.ChooseAddr.pfnSol_choose_addr = (void *)choose_addr;
+#endif
+        }
+        else
+        {
+            g_fVBoxVFS_SolOldAddrMap = true;
+#if defined(VBOX_VFS_SOLARIS_10U6)
+            g_VBoxVFS_SolAddrMap.MapAddr.pfnSol_map_addr_old    = (void *)map_addr;
+#else
+            g_VBoxVFS_SolAddrMap.ChooseAddr.pfnSol_choose_addr_old = (void *)choose_addr;
+#endif
+        }
+
+        RTR0DbgKrnlInfoRelease(hKrnlDbgInfo);
+    }
+    else
+    {
+        cmn_err(CE_NOTE, "RTR0DbgKrnlInfoOpen failed. rc=%d\n", rc);
+        return rc;
+    }
+
         return (mod_install(&modlinkage));
 }

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h

@@ -49 +49 @@
 } sffs_data_t;
 
+/*
+ * 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 VBoxVFS_SolAddrMap
+{
+    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);
+    } MapAddr;
+
+    union
+    {
+        int (*pfnSol_choose_addr)       (struct as *, caddr_t *, size_t, offset_t, uint_t);
+        int (*pfnSol_choose_addr_old)   (struct as *, caddr_t *, size_t, offset_t, int, uint_t);
+    } ChooseAddr;
+} VBoxVFS_SolAddrMap;
+typedef VBoxVFS_SolAddrMap *pVBoxVFS_SolAddrMap;
+
+extern bool                     g_fVBoxVFS_SolOldAddrMap;
+extern VBoxVFS_SolAddrMap       g_VBoxVFS_SolAddrMap;
 
 #ifdef  __cplusplus

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c

@@ -1767 +1767 @@
         if ((flags & MAP_FIXED) == 0)
         {
-                map_addr(addrp, len, off, 1, flags);
+        if (g_fVBoxVFS_SolOldAddrMap)
+            g_VBoxVFS_SolAddrMap.MapAddr.pfnSol_map_addr_old(addrp, len, off, 1, flags);
+        else
+            g_VBoxVFS_SolAddrMap.MapAddr.pfnSol_map_addr(addrp, len, off, flags);
                 if (*addrp == NULL)
                         error = ENOMEM;
@@ -1774 +1777 @@
                 as_unmap(asp, *addrp, len);     /* User specified address, remove any previous mappings */
 #else
-        error = choose_addr(asp, addrp, len, off, ADDR_VACALIGN, flags);
+    if (g_fVBoxVFS_SolOldAddrMap)
+            error = g_VBoxVFS_SolAddrMap.ChooseAddr.pfnSol_choose_addr_old(asp, addrp, len, off, 1, flags);
+    else
+            error = g_VBoxVFS_SolAddrMap.ChooseAddr.pfnSol_choose_addr(asp, addrp, len, off, flags);
 #endif