Changeset 77967 in vbox for trunk/src/VBox

Timestamp:

Mar 31, 2019 7:28:43 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Tried to figure out that fsync issue on 2.4.21-27.EL, but no luck. Various cleanups from what. bugref:9172

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (9 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -540 +540 @@
 {
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 6)
-    return !list_empty(mapping->i_mmap_shared);
+    return !list_empty(&mapping->i_mmap_shared);
 # else
     return mapping->i_mmap_shared != NULL;
@@ -1301 +1301 @@
         Assert((ssize_t)cPages >= 0);
         if (fSetDirty && !PageReserved(pPage))
-            SetPageDirty(pPage);
+            set_page_dirty(pPage);
         vbsf_put_page(pPage);
     }
@@ -1581 +1581 @@
                  * the error.  (Not sure if this is such a great idea...)
                  */
-                if (cbRet > 0)
+                if (cbRet > 0) {
+                    SFLOGFLOW(("vbsf_reg_read: read at %#RX64 -> %Rrc; got cbRet=%#zx already\n", offFile, rc, cbRet));
                     *off = offFile;
-                else
+                } else {
+                    SFLOGFLOW(("vbsf_reg_read: read at %#RX64 -> %Rrc\n", offFile, rc));
                     cbRet = -EPROTO;
+                }
                 break;
             }
@@ -1888 +1891 @@
                      * the error.  (Not sure if this is such a great idea...)
                      */
-                    if (cbRet > 0)
+                    if (cbRet > 0) {
+                        SFLOGFLOW(("vbsf_reg_write: write at %#RX64 -> %Rrc; got cbRet=%#zx already\n", offFile, rc, cbRet));
                         *off = offFile;
-                    else
+                    } else {
+                        SFLOGFLOW(("vbsf_reg_write: write at %#RX64 -> %Rrc\n", offFile, rc));
                         cbRet = -EPROTO;
+                    }
                     break;
                 }
@@ -2058 +2064 @@
         struct page *pPage = papPages[cPages];
         if (fSetDirty && !PageReserved(pPage))
-            SetPageDirty(pPage);
+            set_page_dirty(pPage);
         vbsf_put_page(pPage);
     }
@@ -3073 +3079 @@
     if (sf_r) {
         struct vbsf_super_info *pSuperInfo = VBSF_GET_SUPER_INFO(inode->i_sb);
+        struct address_space   *mapping    = inode->i_mapping;
         Assert(pSuperInfo);
 
+        /* If we're closing the last handle for this inode, make sure the flush
+           the mapping or we'll end up in vbsf_writepage without a handle. */
+        if (   mapping
+            && mapping->nrpages > 0
+            /** @todo && last writable handle */ ) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
-        /* See the smbfs source (file.c). mmap in particular can cause data to be
-         * written to the file after it is closed, which we can't cope with.  We
-         * copy and paste the body of filemap_write_and_wait() here as it was not
-         * defined before 2.6.6 and not exported until quite a bit later. */
-        /* filemap_write_and_wait(inode->i_mapping); */
-        if (inode->i_mapping->nrpages
-            && filemap_fdatawrite(inode->i_mapping) != -EIO)
-            filemap_fdatawait(inode->i_mapping);
-#endif
+            if (filemap_fdatawrite(mapping) != -EIO)
+#else
+            if (   filemap_fdatasync(mapping) == 0
+                && fsync_inode_data_buffers(inode) == 0)
+#endif
+                filemap_fdatawait(inode->i_mapping);
+        }
 
         /* Release sf_r, closing the handle if we're the last user. */
@@ -3179 +3189 @@
     }
 #  else  /* < 2.5.12 */
-    rc  = fsync_inode_buffers(inode);
+    /** @todo
+     * Somethings is buggy here or in the 2.4.21-27.EL kernel I'm testing on.
+     *
+     * In theory we shouldn't need to do anything here, since msync will call
+     * writepage() on each dirty page and we write them out synchronously.  So, the
+     * problem is elsewhere...  Doesn't happen all the time either.  Sigh.
+     */
+    rc = fsync_inode_buffers(inode);
 #   if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 10)
-    rc |= fsync_inode_data_buffers(inode);
+    if (rc == 0 && datasync)
+        rc = fsync_inode_data_buffers(inode);
 #   endif
-    /** @todo probably need to do more here... */
+
 #  endif /* < 2.5.12 */
     return rc;
@@ -3607 +3625 @@
                     i_size_write(inode, offEndOfWrite);
 
+                /* Update and unlock the page. */
                 if (PageError(page))
                     ClearPageError(page);
-
-                err = 0;
-            } else {
-                ClearPageUptodate(page);
-                err = -EPROTO;
+                SetPageUptodate(page);
+                unlock_page(page);
+
+                vbsf_handle_release(pHandle, pSuperInfo, "vbsf_writepage");
+                return 0;
             }
+
+            /*
+             * We failed.
+             */
+            err = -EIO;
         } else
             err = -ENOMEM;
         vbsf_handle_release(pHandle, pSuperInfo, "vbsf_writepage");
     } else {
+        /** @todo we could re-open the file here and deal with this... */
         static uint64_t volatile s_cCalls = 0;
         if (s_cCalls++ < 16)
             printk("vbsf_writepage: no writable handle for %s..\n", sf_i->path->String.ach);
-        SetPageError(page);
-        err = -EPROTO;
-    }
+        err = -EIO;
+    }
+    SetPageError(page);
     unlock_page(page);
     return err;
@@ -3646 +3671 @@
                (unsigned long long)pos, len, flags);
         RTLogBackdoorPrintf("vboxsf: Unexpected call to vbsf_write_begin(pos=%#llx len=%#x flags=%#x)!  Please report.\n",
-                    (unsigned long long)pos, len, flags);
+                            (unsigned long long)pos, len, flags);
 # ifdef WARN_ON
         WARN_ON(1);