Changeset 37806 in vbox

Timestamp:

Jul 6, 2011 3:11:02 PM (14 years ago)

Author:

vboxsync

Message:

Additions/Solaris/SharedFolders: readonly mmap support bits.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_vnode.c (modified) (8 diffs)
• vboxfs_vnode.h (modified) (1 diff)

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

@@ -68 +68 @@
 
 #include <VBox/log.h>
+#include <iprt/asm.h>
 
 #include <unistd.h>
@@ -82 +83 @@
 #include <sys/sunddi.h>
 #include <sys/vfs.h>
+#include <sys/vmsystm.h>
 #if !defined(VBOX_VFS_SOLARIS_10U6)
 #include <sys/vfs_opreg.h>
@@ -1453 +1455 @@
 
 
+#if 0
+/*ARGSUSED*/
+static int
+sffs_getpage(
+        vnode_t         *dvp,
+        offset_t        off,
+        size_t          len,
+        uint_t          *protp,
+        page_t          *pagelist[],
+        size_t          pagelistsize,
+        struct seg      *segp,
+        caddr_t         addr,
+        enum seg_rw     segaccess,
+        cred_t          *credp
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+        , caller_context_t *ct
+#endif
+        )
+{
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_putpage(
+        vnode_t         *dvp,
+        offset_t        off,
+        size_t          len,
+        int                     flags,
+        cred_t          *credp
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+        , caller_context_t *ct
+#endif
+        )
+{
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_map(
+        vnode_t         *dvp,
+        offset_t        off,
+        struct as       *asp,
+        caddr_t         *addrp,
+        size_t          len,
+        uchar_t         prot,
+        uchar_t         maxprot,
+        uint_t          flags,
+        cred_t          *credp
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+        , caller_context_t *ct
+#endif
+        )
+{
+        /*
+         * Invocation: mmap()-smmap_common()->VOP_MAP()->sffs_map(). Once the segment driver
+         * creates the new segment in segvn_create(), it'll invoke down the line VOP_ADDMAP()->sffs_addmap()
+         */
+        int error;
+        if ((prot & PROT_WRITE))
+                return (ENOTSUP);
+
+        if (off < 0 || len > MAXOFFSET_T - off)
+                return (ENXIO);
+
+        if (dvp->v_type != VREG)
+                return (ENODEV);
+
+        if (dvp->v_flag & VNOMAP)
+                return (ENOSYS);
+
+        mutex_enter(&sffs_lock);
+        as_rangelock(asp);
+
+        error = choose_addr(asp, addrp, len, off, ADDR_VACALIGN, flags);
+        if (!error)
+        {
+                segvn_crargs_t vnodeargs;
+                memset(&vnodeargs, 0, sizeof(vnodeargs));
+                vnodeargs.vp = dvp;
+                vnodeargs.cred = credp;
+                vnodeargs.offset = off;
+                vnodeargs.type = flags & MAP_TYPE;
+                vnodeargs.prot = prot;
+                vnodeargs.maxprot = maxprot;
+                vnodeargs.flags = flags & ~MAP_TYPE;
+                vnodeargs.amp = NULL;           /* anon. mapping */
+                vnodeargs.szc = 0;                      /* preferred page size code */
+                vnodeargs.lgrp_mem_policy_flags = 0;
+
+                error = as_map(asp, *addrp, len, segvn_create, &vnodeargs);
+        }
+
+        as_rangeunlock(asp);
+        mutex_exit(&sffs_lock);
+
+        return (error);
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_addmap(
+        vnode_t         *dvp,
+        offset_t        off,
+        struct as       *asp,
+        caddr_t         addr,
+        size_t          len,
+        uchar_t         prot,
+        uchar_t         maxprot,
+        uint_t          flags,
+        cred_t          *credp
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+        , caller_context_t *ct
+#endif
+        )
+{
+        sfnode_t *node = VN2SFN(dvp);
+        uint64_t npages = btopr(len);
+
+        ASSERT(node);
+        ASMAtomicAddU64(&node->sf_mapcnt, npages);
+        return (0);
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_delmap(
+        vnode_t         *dvp,
+        offset_t        off,
+        struct as       *asp,
+        caddr_t         addr,
+        size_t          len,
+        uint_t          prot,
+        uint_t          maxprot,
+        uint_t          flags,
+        cred_t          *credp
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+        , caller_context_t *ct
+#endif
+        )
+{
+        sfnode_t *node = VN2SFN(dvp);
+        uint64_t npages = btopr(len);
+
+        ASSERT(node->sf_mapcnt >= npages);
+        ASMAtomicSubU64(&node->sf_mapcnt, npages);
+        return (0);
+}
+#endif
+
+
 /*ARGSUSED*/
 static int
@@ -1759 +1915 @@
         VOPNAME_SPACE,          sffs_space,
         VOPNAME_WRITE,          sffs_write,
+
+# if 0
+        VOPNAME_MAP,            sffs_map,
+        VOPNAME_ADDMAP,         sffs_addmap,
+        VOPNAME_DELMAP,         sffs_delmap,
+        VOPNAME_GETPAGE,        sffs_getpage,
+        VOPNAME_PUTPAGE,        sffs_putpage,
+# endif
+
         NULL,                   NULL
 #else
@@ -1781 +1946 @@
         VOPNAME_SPACE,          { .vop_space = sffs_space },
         VOPNAME_WRITE,          { .vop_write = sffs_write },
+
+#if 0
+        VOPNAME_MAP,            { .vop_map = sffs_map },
+        VOPNAME_ADDMAP,         { .vop_addmap = sffs_addmap },
+        VOPNAME_DELMAP,         { .vop_delmap = sffs_delmap },
+        VOPNAME_GETPAGE,        { .vop_getpage = sffs_getpage },
+        VOPNAME_PUTPAGE,        { .vop_putpage = sffs_putpage },
+# endif
+
         NULL,                   NULL
 #endif
@@ -1874 +2048 @@
 }
 
+#if 0
+/* Debug helper functions */
 static void
 sfnode_print(sfnode_t *node)
@@ -1892 +2068 @@
 }
 
-void
-sfnode_list()
+static void
+sfnode_list(void)
 {
         sfnode_t *n;
@@ -1902 +2078 @@
                 sfnode_print(n);
 }
-
+#endif
+

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

@@ -61 +61 @@
         sffs_dirents_t  *sf_dir_list;   /* list of entries for this directory */
         sffs_stats_t    *sf_dir_stats;  /* file attrs for the above entries */
+#if 0
+    volatile uint64_t   sf_mapcnt;  /* number of mapped pages */
+#endif
 } sfnode_t;