Changeset 38166 in vbox for trunk/src

Timestamp:

Jul 25, 2011 4:36:08 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris/SharedFolders: read-only mmap bits.

File:

• trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c (modified) (11 diffs)

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

@@ -213 +213 @@
                 VFS_HOLD(vp->v_vfsp);
                 vn_setops(vp, sffs_ops);
-                vp->v_flag = VNOMAP | VNOSWAP;
+                vp->v_flag = VNOSWAP | VNOMAP;  /* @todo -XXX- remove VNOMAP when ro-mmap is working*/
                 vn_exists(vp);
                 vp->v_data = node;
@@ -1487 +1487 @@
  * the file data into it.
  */
-static int
+int
 sffs_readpages(
         vnode_t         *dvp,
@@ -1509 +1509 @@
         ASSERT(node->sf_file);
 
+        cmn_err(CE_NOTE, "sffs_readpages\n");
         if (pagelistsize == PAGESIZE)
         {
@@ -1514 +1515 @@
                 io_len = PAGESIZE;
 
+                cmn_err(CE_NOTE, "sffs_readpages io_off=%lld io_len=%lld\n", (u_longlong_t)io_off, (u_longlong_t)io_len);
+
                 ppages = page_create_va(dvp, io_off, io_len, PG_WAIT | PG_EXCL, segp, addr);
         }
@@ -1522 +1525 @@
         if (!ppages)
         {
+                cmn_err(CE_NOTE, "sffs_readpages nothing done\n");
                 *pagelist = NULL;
                 return (0);
@@ -1535 +1539 @@
                 ASSERT3U(io_off, ==, pcur->p_offset);
 
+                cmn_err(CE_NOTE, "sffs_readpages page-by-page reading io_off=%lld\n", (u_longlong_t)io_off);
                 caddr_t virtaddr = sffs_page_map(pcur, segaccess);
                 uint32_t bytes = PAGESIZE;
@@ -1554 +1559 @@
         pvn_plist_init(ppages, pagelist, pagelistsize, off, io_len, segaccess);
         ASSERT(pagelist == NULL || (*pagelist)->p_offset == off);
+        cmn_err(CE_NOTE, "sffs_readpages done\n");
+
         return (0);
 }
@@ -1578 +1585 @@
         int error = 0;
         page_t **pageliststart = pagelist;
+        sfnode_t *node = VN2SFN(dvp);
+        ASSERT(node);
+        ASSERT(node->sf_file);
 
         if (segaccess == S_WRITE)
                 return (ENOSYS);        /* Will this ever happen? */
 
-        if (protp)
-                *protp = PROT_ALL;
-
-        /* We don't really support async ops, pretend success. */
+        /* Don't bother about faultahead for now. */
         if (pagelist == NULL)
                 return (0);
@@ -1595 +1602 @@
         ASSERT(pagelistsize >= len);
 
+        if (protp)
+                *protp = PROT_ALL;
+
         mutex_enter(&sffs_lock);
+
+        /* Don't map pages past end of the file. */
+        if (off + len > node->sf_stat.sf_size + PAGEOFFSET)
+        {
+                mutex_exit(&sffs_lock);
+                return (EFAULT);
+        }
 
         while (len > 0)
@@ -1614 +1631 @@
                 }
 
+                cmn_err(CE_NOTE, "sffs_getpage addr=%p len=%lld off=%lld\n", addr, (u_longlong_t)len, (u_longlong_t)off);
                 while (*pagelist)
                 {
@@ -1629 +1647 @@
                         pagelist++;
                 }
-
-                /*
-                 * Fill the page list array with any pages left in the cache.
-                 */
-                while (pagelistsize > 0)
-                {
-                        if ((*pagelist++ = page_lookup_nowait(dvp, off, SE_SHARED)) != NULL)
-                        {
-                                off += PAGESIZE;
-                                pagelistsize -= PAGESIZE;
-                        }
-                        else
-                                break;
-                }
+        }
+
+        /*
+         * Fill the page list array with any pages left in the cache.
+         */
+        while (   pagelistsize > 0
+                   && (*pagelist++ = page_lookup_nowait(dvp, off, SE_SHARED)))
+        {
+                off += PAGESIZE;
+                pagelistsize -= PAGESIZE;
         }
 
         *pagelist = NULL;
         mutex_exit(&sffs_lock);
+        cmn_err(CE_NOTE,  "sffs_getpage done\n");
         return (error);
 }