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

Timestamp:

Mar 2, 2019 3:27:42 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Enabled new code for reading directories. This does not buffer the entire content and will have correct inode numbers for '.' and '..'. Also corrected the 6th parameter of VBoxSFParmList, it's meaning was accidentally inverted. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (7 diffs)
• vfsmod.h (modified) (3 diffs)

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

@@ -202 +202 @@
         sf_d->cbValid      = 0;
         sf_d->pEntry       = NULL;
+        sf_d->fNoMoreFiles = false;
         if (sf_d->pBuf) {
             kfree(sf_d->pBuf);
@@ -251 +252 @@
 
     /*
+     * Don't call the host again if we've reached the end of the
+     * directory entries already.
+     */
+    if (sf_d->fNoMoreFiles) {
+        if (!fRestart)
+            return 0;
+        sf_d->fNoMoreFiles = false;
+    }
+
+
+    /*
      * Make sure we've got some kind of buffers.
      */
@@ -256 +268 @@
         /* Likely, except for the first time. */
     } else {
-        sf_d->pBuf = (PSHFLDIRINFO)kmalloc(_16K, GFP_KERNEL);
+        sf_d->pBuf = (PSHFLDIRINFO)kmalloc(_64K, GFP_KERNEL);
         if (sf_d->pBuf)
-            sf_d->cbBuf = _16K;
+            sf_d->cbBuf = _64K;
         else {
             sf_d->pBuf = (PSHFLDIRINFO)kmalloc(_4K, GFP_KERNEL);
@@ -281 +293 @@
             sf_d->cbValid      = pReq->Parms.cb32Buffer.u.value32;
             sf_d->cEntriesLeft = pReq->Parms.c32Entries.u.value32;
+            sf_d->fNoMoreFiles = pReq->Parms.f32More.u.value32 == 0;
         } else {
             sf_d->pEntry       = sf_d->pBuf;
             sf_d->cbValid      = 0;
             sf_d->cEntriesLeft = 0;
-            if (rc == VERR_NO_MORE_FILES)
+            if (rc == VERR_NO_MORE_FILES) {
+                sf_d->fNoMoreFiles = true;
                 rc = 0;
-            else {
+            } else {
                 /* In theory we could end up here with a buffer overflow, but
                    with a 4KB minimum buffer size that's very unlikely with the
@@ -558 +572 @@
              */
             uintptr_t const offEntryInBuf = (uintptr_t)pEntry - (uintptr_t)pBuf;
-            uint16_t cbSrcName;
-            uint16_t cchSrcName;
+            uint16_t        cbSrcName;
+            uint16_t        cchSrcName;
             AssertLogRelMsgBreak(offEntryInBuf + RT_UOFFSETOF(SHFLDIRINFO, name.String) <= cbValid,
                                  ("%#llx + %#x vs %#x\n", offEntryInBuf, RT_UOFFSETOF(SHFLDIRINFO, name.String), cbValid));
@@ -597 +611 @@
                     sf_d->cEntriesLeft = cEntriesLeft;
                     sf_d->pEntry       = pEntry;
+                    sf_d->offPos       = offPos;
                     return 0;
                 }
@@ -613 +628 @@
         } while (cEntriesLeft > 0);
 
-        /* Reset the state. */
+        /* Done with all available entries. */
+        sf_d->offPos       = offPos + cEntriesLeft;
+        sf_d->pEntry       = pBuf;
         sf_d->cEntriesLeft = 0;
-        sf_d->pEntry       = pBuf;
     }
 

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

@@ -39 +39 @@
 # define VBOX_STRICT
 #endif
-#define VBSF_BUFFER_DIRS /* till I've fully tested the other code */
 
 #define LOG_GROUP LOG_GROUP_SHARED_FOLDERS
@@ -55 +54 @@
 #include <iprt/asm.h>
 #include "vbsfmount.h"
-
 
 /*
@@ -293 +291 @@
     /** The next entry. */
     PSHFLDIRINFO        pEntry;
+    /** Set if there are no more files.  */
+    bool                fNoMoreFiles;
 #else
     /** List of vbsf_dir_buf. */