Changeset 77976 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Apr 1, 2019 11:12:02 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Update inode info in vbsf_reg_open since we got accurate info from the host, allowing us to catch host mtime changes and timely invalidate the page cache. Get correct file position on O_APPEND from the host. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• regops.c (modified) (12 diffs)
• vfsmod.c (modified) (1 diff)

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

@@ -1863 +1863 @@
 
                 cbRet   += cbActual;
-                offFile += cbActual;
                 buf      = (uint8_t *)buf + cbActual;
                 size    -= cbActual;
+
+                offFile += cbActual;
+                if ((file->f_flags & O_APPEND) && (g_fSfFeatures & SHFL_FEATURE_WRITE_UPDATES_OFFSET))
+                    offFile = pReq->Parms.off64Write.u.value64;
                 if (offFile > i_size_read(inode))
                     i_size_write(inode, offFile);
+
                 sf_i->force_restat = 1; /* mtime (and size) may have changed */
 
@@ -1937 +1941 @@
 
     pos = *off;
-    /** @todo This should be handled by the host, it returning the new file
-     *        offset when appending.  We may have an outdated i_size value here! */
     if (file->f_flags & O_APPEND)
         pos = i_size_read(inode);
@@ -1988 +1990 @@
                                                    NULL /*papSrcPages*/, 0 /*offSrcPage0*/, 0 /*cSrcPages*/);
                     pos += cbRet;
+                    if ((file->f_flags & O_APPEND) && (g_fSfFeatures & SHFL_FEATURE_WRITE_UPDATES_OFFSET))
+                        pos = pReq->Parms.off64Write.u.value64;
                     *off = pos;
                     if (pos > i_size_read(inode))
@@ -2630 +2634 @@
  */
 static ssize_t vbsf_reg_write_iter_locking(struct kiocb *kio, struct iov_iter *iter, size_t cbToWrite, loff_t offFile,
-                                           struct vbsf_super_info *pSuperInfo, struct vbsf_reg_info *sf_r,
-                                           struct inode *inode, struct vbsf_inode_info *sf_i, struct address_space *mapping)
+                                           struct vbsf_super_info *pSuperInfo, struct vbsf_reg_info *sf_r, struct inode *inode,
+                                           struct vbsf_inode_info *sf_i, struct address_space *mapping, bool fAppend)
 {
     /*
@@ -2697 +2701 @@
 
                 cbRet      += cbActual;
+                cbToWrite  -= cbActual;
+
                 offFile    += cbActual;
+                if (fAppend && (g_fSfFeatures & SHFL_FEATURE_WRITE_UPDATES_OFFSET))
+                    offFile = pReq->Parms.off64Write.u.value64;
                 kio->ki_pos = offFile;
-                cbToWrite  -= cbActual;
                 if (offFile > i_size_read(inode))
                     i_size_write(inode, offFile);
+
                 sf_i->force_restat = 1; /* mtime (and size) may have changed */
 
@@ -2780 +2788 @@
     loff_t                  offFile    = kio->ki_pos;
 # endif
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+    bool const              fAppend    = RT_BOOL(kio->ki_flags & IOCB_APPEND);
+# else
+    bool const              fAppend    = RT_BOOL(kio->ki_filp->f_flags & O_APPEND);
+# endif
+
 
     SFLOGFLOW(("vbsf_reg_write_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n",
@@ -2786 +2800 @@
 
     /*
-     * Enforce APPEND flag.
+     * Enforce APPEND flag (more later).
      */
-    /** @todo This should be handled by the host, it returning the new file
-     *        offset when appending.  We may have an outdated i_size value here! */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
-    if (kio->ki_flags & IOCB_APPEND)
-# else
-    if (kio->ki_filp->f_flags & O_APPEND)
-# endif
+    if (fAppend)
         kio->ki_pos = offFile = i_size_read(inode);
 
@@ -2848 +2856 @@
                         vbsf_reg_write_sync_page_cache(mapping, offFile, (uint32_t)cbRet, pReq->abData,
                                                        NULL /*papSrcPages*/, 0 /*offSrcPage0*/, 0 /*cSrcPages*/);
-                        kio->ki_pos = offFile += cbRet;
+
+                        offFile += cbRet;
+                        if (fAppend && (g_fSfFeatures & SHFL_FEATURE_WRITE_UPDATES_OFFSET))
+                            offFile = pReq->Parms.off64Write.u.value64;
+                        kio->ki_pos = offFile;
                         if (offFile > i_size_read(inode))
                             i_size_write(inode, offFile);
+
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
                         if ((size_t)cbRet < cbToWrite)
@@ -2871 +2884 @@
      * Otherwise do the page locking thing.
      */
-    return vbsf_reg_write_iter_locking(kio, iter, cbToWrite, offFile, pSuperInfo, sf_r, inode, sf_i, mapping);
+    return vbsf_reg_write_iter_locking(kio, iter, cbToWrite, offFile, pSuperInfo, sf_r, inode, sf_i, mapping, fAppend);
 }
 
@@ -3033 +3046 @@
     if (pReq->CreateParms.Handle != SHFL_HANDLE_NIL) {
         vbsf_dentry_chain_increase_ttl(dentry);
+        vbsf_update_inode(inode, sf_i, &pReq->CreateParms.Info, pSuperInfo, false /*fInodeLocked*/, 0 /*fSetAttrs*/);
         rc_linux = 0;
     } else {
         switch (pReq->CreateParms.Result) {
             case SHFL_PATH_NOT_FOUND:
+                vbsf_dentry_invalidate_ttl(dentry);
                 rc_linux = -ENOENT;
                 break;
             case SHFL_FILE_NOT_FOUND:
+                vbsf_dentry_invalidate_ttl(dentry);
                 /** @todo sf_dentry_increase_parent_ttl(file->f_dentry); if we can trust it.  */
                 rc_linux = -ENOENT;
@@ -3045 +3061 @@
             case SHFL_FILE_EXISTS:
                 vbsf_dentry_chain_increase_ttl(dentry);
+                vbsf_update_inode(inode, sf_i, &pReq->CreateParms.Info, pSuperInfo, false /*fInodeLocked*/, 0 /*fSetAttrs*/);
                 rc_linux = -EEXIST;
                 break;
@@ -3054 +3071 @@
     }
 
-/** @todo update the inode here, pReq carries the latest stats!  Very helpful
- *        for detecting host side changes. */
-
-    sf_i->force_restat = 1; /** @todo Why?!? */
     sf_r->Handle.hHost = pReq->CreateParms.Handle;
     file->private_data = sf_r;

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

@@ -71 +71 @@
 /** Last valid shared folders function number. */
 uint32_t     g_uSfLastFunction = SHFL_FN_SET_FILE_SIZE;
-/** Shared folders features. */
+/** Shared folders features (SHFL_FEATURE_XXX). */
 uint64_t     g_fSfFeatures = 0;