Changeset 77741 in vbox

Timestamp:

Mar 17, 2019 3:42:04 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Fixed nls conversion issue (don't try convert the zero terminator, at least not on 2.6.8). Hacked around missing invalidate_mapping_pages symbol in kernels before 2.6.21.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (1 diff)
• regops.c (modified) (3 diffs)
• utils.c (modified) (1 diff)
• vfsmod.c (modified) (2 diffs)
• vfsmod.h (modified) (2 diffs)

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

@@ -288 +288 @@
 {
     char szDstName[NAME_MAX];
-    int rc = vbsf_nlscpy(sf_g, szDstName, sizeof(szDstName), pszSrcName, cchSrcName + 1);
+    int rc = vbsf_nlscpy(sf_g, szDstName, sizeof(szDstName), pszSrcName, cchSrcName);
     if (rc == 0) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)

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

@@ -545 +545 @@
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
     ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, papPages,
-                               fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
+                                                   fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
     ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
@@ -844 +844 @@
     if (mapping)
         invalidate_inode_pages2_range(mapping, offStart >> PAGE_SHIFT, (offEnd - 1) >> PAGE_SHIFT);
-# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 60)
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21)
+    if (mapping && mapping->nrpages > 0)
+        invalidate_mapping_pages(mapping, offStart >> PAGE_SHIFT, (offEnd - 1) >> PAGE_SHIFT);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 60) && 0 /** @todo invalidate_mapping_pages was added in 2.5.60, but exported in 2.6.21 */
     if (mapping && mapping->nrpages > 0)
         invalidate_mapping_pages(mapping, offStart >> PAGE_SHIFT, (offEnd - 1) >> PAGE_SHIFT);
@@ -2692 +2695 @@
 /**
  * Address space (for the page cache) operations for regular files.
+ *
+ * @todo the FsPerf touch/flush (mmap) test fails on 4.4.0 (ubuntu 16.04 lts).
  */
 struct address_space_operations vbsf_reg_aops = {

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

@@ -39 +39 @@
 int vbsf_nlscpy(struct vbsf_super_info *sf_g, char *name, size_t name_bound_len, const unsigned char *utf8_name, size_t utf8_len)
 {
+    Assert(RTStrNLen(utf8_name, utf8_len) == utf8_len);
+
     if (sf_g->nls) {
-        const char *in;
-        char *out;
-        size_t out_len;
-        size_t out_bound_len;
-        size_t in_bound_len;
-
-        in = utf8_name;
-        in_bound_len = utf8_len;
-
-        out = name;
-        out_len = 0;
-        out_bound_len = name_bound_len;
+        const char *in              = utf8_name;
+        size_t      in_bound_len    = utf8_len;
+        char       *out             = name;
+        size_t      out_bound_len   = name_bound_len;
+        size_t      out_len         = 0;
 
         while (in_bound_len) {
-            int nb;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
             unicode_t uni;
-
-            nb = utf8_to_utf32(in, in_bound_len, &uni);
+            int cbInEnc = utf8_to_utf32(in, in_bound_len, &uni);
 #else
             linux_wchar_t uni;
-
-            nb = utf8_mbtowc(&uni, in, in_bound_len);
-#endif
-            if (nb < 0) {
-                LogFunc(("utf8_mbtowc failed(%s) %x:%d\n", (const char *)utf8_name, *in, in_bound_len));
+            int cbInEnc = utf8_mbtowc(&uni, in, in_bound_len);
+#endif
+            if (cbInEnc >= 0) {
+                int cbOutEnc = sf_g->nls->uni2char(uni, out, out_bound_len);
+                if (cbOutEnc >= 0) {
+                    /*SFLOG3(("vbsf_nlscpy: cbOutEnc=%d cbInEnc=%d uni=%#x in_bound_len=%u\n", cbOutEnc, cbInEnc, uni, in_bound_len));*/
+                    out           += cbOutEnc;
+                    out_bound_len -= cbOutEnc;
+                    out_len       += cbOutEnc;
+
+                    in            += cbInEnc;
+                    in_bound_len  -= cbInEnc;
+                } else {
+                    SFLOG(("vbsf_nlscpy: nls->uni2char failed with %d on %#x (pos %u in '%s'), out_bound_len=%u\n",
+                           cbOutEnc, uni, in - (const char *)utf8_name, (const char *)utf8_name, (unsigned)out_bound_len));
+                    return cbOutEnc;
+                }
+            } else {
+                SFLOG(("vbsf_nlscpy: utf8_to_utf32/utf8_mbtowc failed with %d on %x (pos %u in '%s'), in_bound_len=%u!\n",
+                       cbInEnc, *in, in - (const char *)utf8_name, (const char *)utf8_name, (unsigned)in_bound_len));
                 return -EINVAL;
             }
-            in += nb;
-            in_bound_len -= nb;
-
-            nb = sf_g->nls->uni2char(uni, out, out_bound_len);
-            if (nb < 0) {
-                LogFunc(("nls->uni2char failed(%s) %x:%d\n", utf8_name, uni, out_bound_len));
-                return nb;
-            }
-            out += nb;
-            out_bound_len -= nb;
-            out_len += nb;
         }
 
-        *out = 0;
+        *out = '\0';
     } else {
         if (utf8_len + 1 > name_bound_len)

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

@@ -193 +193 @@
                 sf_g->fNlsIsUtf8 = false;
                 sf_g->nls = load_nls(info->nls_name);
-                if (!sf_g->nls) {
+                if (sf_g->nls) {
+                    SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: nls=%s -> %p\n", info->nls_name, sf_g->nls));
+                } else {
                     SFLOGRELBOTH(("vboxsf: Failed to load nls '%s'!\n", info->nls_name));
                     rc = -EINVAL;
@@ -206 +208 @@
                 sf_g->fNlsIsUtf8 = false;
                 sf_g->nls = load_nls_default();
+                SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: CONFIG_NLS_DEFAULT=%s -> %p\n", CONFIG_NLS_DEFAULT, sf_g->nls));
             } else
                 sf_g->nls = NULL;

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

@@ -59 +59 @@
  * Logging wrappers.
  */
-#if 1
+#if 0
 # define TRACE()                LogFunc(("tracepoint\n"))
-# define SFLOGFLOW(aArgs)       Log(aArgs)
+# define SFLOG(aArgs)           Log(aArgs)
+# define SFLOGFLOW(aArgs)       LogFlow(aArgs)
 # define SFLOG2(aArgs)          Log2(aArgs)
 # define SFLOG3(aArgs)          Log3(aArgs)
@@ -70 +71 @@
 #else
 # define TRACE()                RTLogBackdoorPrintf("%s: tracepoint\n", __FUNCTION__)
+# define SFLOG(aArgs)           RTLogBackdoorPrintf aArgs
 # define SFLOGFLOW(aArgs)       RTLogBackdoorPrintf aArgs
 # define SFLOG2(aArgs)          RTLogBackdoorPrintf aArgs