Changeset 78673 in vbox for trunk/src/VBox

Timestamp:

May 22, 2019 5:43:36 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: More tweaks/options for tailorying windows testing. bugref:9172

File:

• trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp (modified) (31 diffs)

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -325 +325 @@
     kCmdOpt_MMap,
     kCmdOpt_NoMMap,
+    kCmdOpt_MMapCoherency,
+    kCmdOpt_NoMMapCoherency,
+    kCmdOpt_MMapPlacement,
     kCmdOpt_IgnoreNoCache,
     kCmdOpt_NoIgnoreNoCache,
@@ -344 +347 @@
     kCmdOpt_ManyTreeDepth,
 
+    kCmdOpt_MaxBufferSize,
+
     kCmdOpt_End
 };
@@ -369 +374 @@
     { "--subdirs-per-dir",          kCmdOpt_ManyTreeSubdirsPerDir,  RTGETOPT_REQ_UINT32 },
     { "--tree-depth",               kCmdOpt_ManyTreeDepth,          RTGETOPT_REQ_UINT32 },
+    { "--max-buffer-size",          kCmdOpt_MaxBufferSize,          RTGETOPT_REQ_UINT32 },
+    { "--mmap-placement",           kCmdOpt_MMapPlacement,          RTGETOPT_REQ_STRING },
 
     { "--open",                     kCmdOpt_Open,                   RTGETOPT_REQ_NOTHING },
@@ -426 +433 @@
     { "--mmap",                     kCmdOpt_MMap,                   RTGETOPT_REQ_NOTHING },
     { "--no-mmap",                  kCmdOpt_NoMMap,                 RTGETOPT_REQ_NOTHING },
+    { "--mmap-coherency",           kCmdOpt_MMapCoherency,          RTGETOPT_REQ_NOTHING },
+    { "--no-mmap-coherency",        kCmdOpt_NoMMapCoherency,        RTGETOPT_REQ_NOTHING },
     { "--ignore-no-cache",          kCmdOpt_IgnoreNoCache,          RTGETOPT_REQ_NOTHING },
     { "--no-ignore-no-cache",       kCmdOpt_NoIgnoreNoCache,        RTGETOPT_REQ_NOTHING },
@@ -460 +469 @@
 /** Verbosity level. */
 static uint32_t     g_uVerbosity = 0;
+/** Max buffer size, UINT32_MAX for unlimited.
+ * This is for making sure we don't run into the MDL limit on windows, which
+ * a bit less than 64 MiB. */
+#if defined(RT_OS_WINDOWS)
+static uint32_t     g_cbMaxBuffer = _32M;
+#else
+static uint32_t     g_cbMaxBuffer = UINT32_MAX;
+#endif
+/** When to place the mmap test. */
+static int          g_iMMapPlacement = 0;
 
 /** @name Selected subtest
@@ -495 +514 @@
 static bool         g_fFSync                = true;
 static bool         g_fMMap                 = true;
+static bool         g_fMMapCoherency        = true;
 static bool         g_fCopy                 = true;
 static bool         g_fRemote               = true;
@@ -1306 +1326 @@
      * Allocate a suitable buffer.
      */
-    size_t   cbBuf = cbToWrite >= _2M ? _2M : RT_ALIGN_Z((size_t)cbToWrite, 512);
-    uint8_t *pbBuf = (uint8_t *)RTMemTmpAlloc(cbBuf);
+    size_t   cbMaxBuf = RT_MIN(_2M, g_cbMaxBuffer);
+    size_t   cbBuf    = cbToWrite >= cbMaxBuf ? cbMaxBuf : RT_ALIGN_Z((size_t)cbToWrite, 512);
+    uint8_t *pbBuf    = (uint8_t *)RTMemTmpAlloc(cbBuf);
     if (!pbBuf)
     {
@@ -2201 +2222 @@
 void fsPerfNtQueryInfoFileWorker(HANDLE hNtFile1, uint32_t fType)
 {
+    char const chType = fType == RTFS_TYPE_DIRECTORY ? 'd' : 'r';
+
     /** @todo may run out of buffer for really long paths? */
     union
@@ -2363 +2386 @@
             {
                 if (rcNt != STATUS_INVALID_INFO_CLASS)
-                    RTTestIFailed("%s/%#x: %#x, expected STATUS_INVALID_INFO_CLASS", pszClass, cbBuf, rcNt);
+                    RTTestIFailed("%s/%#x/%c: %#x, expected STATUS_INVALID_INFO_CLASS", pszClass, cbBuf, chType, rcNt);
             }
             else if (   rcNt != STATUS_INVALID_INFO_CLASS
@@ -2388 +2411 @@
                                || (   fType == RTFS_TYPE_DIRECTORY
                                    && (enmClass == FileSfioReserveInformation || enmClass == FileStatLxInformation)))
+                     && !(rcNt == STATUS_INVALID_DEVICE_REQUEST && fType == RTFS_TYPE_FILE)
                     )
-                RTTestIFailed("%s/%#x: %#x", pszClass, cbBuf, rcNt);
+                RTTestIFailed("%s/%#x/%c: %#x", pszClass, cbBuf, chType, rcNt);
             if (   (Ios.Status != VirginIos.Status || Ios.Information != VirginIos.Information)
                 && !(   fType == RTFS_TYPE_DIRECTORY /* NTFS/W10-17763 */
                     && Ios.Status == rcNt && Ios.Information == 0) )
-                RTTestIFailed("%s/%#x: I/O status block was modified: %#x %#zx", pszClass, cbBuf, Ios.Status, Ios.Information);
+                RTTestIFailed("%s/%#x/%c: I/O status block was modified: %#x %#zx",
+                              pszClass, cbBuf, chType, Ios.Status, Ios.Information);
             if (!ASMMemIsAllU8(&uBuf, sizeof(uBuf), 0xff))
-                RTTestIFailed("%s/%#x: Buffer was touched in failure case!", pszClass, cbBuf);
+                RTTestIFailed("%s/%#x/%c: Buffer was touched in failure case!", pszClass, cbBuf, chType);
         }
     }
@@ -3440 +3465 @@
 
 
+int fsPerfIoPrepFileWorker(RTFILE hFile1, uint64_t cbFile, uint8_t *pbBuf, size_t cbBuf)
+{
+    /*
+     * Fill the file with 0xf6 and insert offset markers with 1KB intervals.
+     */
+    RTTESTI_CHECK_RC_RET(RTFileSeek(hFile1, 0, RTFILE_SEEK_BEGIN, NULL), VINF_SUCCESS, rcCheck);
+    memset(pbBuf, 0xf6, cbBuf);
+    uint64_t cbLeft = cbFile;
+    uint64_t off = 0;
+    while (cbLeft > 0)
+    {
+        Assert(!(off   & (_1K - 1)));
+        Assert(!(cbBuf & (_1K - 1)));
+        for (size_t offBuf = 0; offBuf < cbBuf; offBuf += _1K, off += _1K)
+            *(uint64_t *)&pbBuf[offBuf] = off;
+
+        size_t cbToWrite = cbBuf;
+        if (cbToWrite > cbLeft)
+            cbToWrite = (size_t)cbLeft;
+
+        RTTESTI_CHECK_RC_RET(RTFileWrite(hFile1, pbBuf, cbToWrite, NULL), VINF_SUCCESS, rcCheck);
+        cbLeft -= cbToWrite;
+    }
+    return VINF_SUCCESS;
+}
+
 int fsPerfIoPrepFile(RTFILE hFile1, uint64_t cbFile, uint8_t **ppbFree)
 {
@@ -3453 +3504 @@
      */
     RTTESTI_CHECK_RC_RET(RTFileSeek(hFile1, 0, RTFILE_SEEK_BEGIN, NULL), VINF_SUCCESS, rcCheck);
-    size_t   cbBuf = _1M;
+    size_t   cbBuf = RT_MIN(_1M, g_cbMaxBuffer);
     uint8_t *pbBuf = *ppbFree = (uint8_t *)RTMemAlloc(cbBuf);
     RTTESTI_CHECK_RET(pbBuf != NULL, VERR_NO_MEMORY);
@@ -3473 +3524 @@
      * Fill the file with 0xf6 and insert offset markers with 1KB intervals.
      */
-    RTTESTI_CHECK_RC_RET(RTFileSeek(hFile1, 0, RTFILE_SEEK_BEGIN, NULL), VINF_SUCCESS, rcCheck);
-    memset(pbBuf, 0xf6, cbBuf);
-    cbLeft = cbFile;
-    uint64_t off = 0;
-    while (cbLeft > 0)
-    {
-        Assert(!(off   & (_1K - 1)));
-        Assert(!(cbBuf & (_1K - 1)));
-        for (size_t offBuf = 0; offBuf < cbBuf; offBuf += _1K, off += _1K)
-            *(uint64_t *)&pbBuf[offBuf] = off;
-
-        size_t cbToWrite = cbBuf;
-        if (cbToWrite > cbLeft)
-            cbToWrite = (size_t)cbLeft;
-
-        RTTESTI_CHECK_RC_RET(RTFileWrite(hFile1, pbBuf, cbToWrite, NULL), VINF_SUCCESS, rcCheck);
-
-        cbLeft -= cbToWrite;
-    }
-
-    return VINF_SUCCESS;
-}
-
+    return fsPerfIoPrepFileWorker(hFile1, cbFile, pbBuf, cbBuf);
+}
+
+/**
+ * Used in relation to the mmap test when in non-default position.
+ */
+int fsPerfReinitFile(RTFILE hFile1, uint64_t cbFile)
+{
+    size_t   cbBuf = RT_MIN(_1M, g_cbMaxBuffer);
+    uint8_t *pbBuf = (uint8_t *)RTMemAlloc(cbBuf);
+    RTTESTI_CHECK_RET(pbBuf != NULL, VERR_NO_MEMORY);
+
+    int rc = fsPerfIoPrepFileWorker(hFile1, cbFile, pbBuf, cbBuf);
+
+    RTMemFree(pbBuf);
+    return rc;
+}
 
 /**
@@ -3849 +3894 @@
      */
     FSPERFSENDFILEARGS Args;
-    Args.cbBuf = RT_MIN(cbFileMax, _16M);
+    Args.cbBuf = RT_MIN(RT_MIN(cbFileMax, _16M), g_cbMaxBuffer);
     Args.pbBuf = (uint8_t *)RTMemAlloc(Args.cbBuf);
     while (!Args.pbBuf)
@@ -4106 +4151 @@
      */
     FSPERFSPLICEARGS Args;
-    Args.cbBuf = RT_MIN(cbFileMax, _16M);
+    Args.cbBuf = RT_MIN(RT_MIN(cbFileMax, _16M), g_cbMaxBuffer);
     Args.pbBuf = (uint8_t *)RTMemAlloc(Args.cbBuf);
     while (!Args.pbBuf)
@@ -4330 +4375 @@
      */
     FSPERFSPLICEARGS Args;
-    Args.cbBuf = RT_MIN(cbFileMax, _16M);
+    Args.cbBuf = RT_MIN(RT_MIN(cbFileMax, _16M), g_cbMaxBuffer);
     Args.pbBuf = (uint8_t *)RTMemAlloc(Args.cbBuf);
     while (!Args.pbBuf)
@@ -4523 +4568 @@
      * Allocate a big buffer we can play around with.  Min size is 1MB.
      */
-    size_t   cbBuf = cbFile < _64M ? (size_t)cbFile : _64M;
-    uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBuf);
+    size_t   cbMaxBuf = RT_MIN(_64M, g_cbMaxBuffer);
+    size_t   cbBuf    = cbFile < cbMaxBuf ? (size_t)cbFile : cbMaxBuf;
+    uint8_t *pbBuf    = (uint8_t *)RTMemPageAlloc(cbBuf);
     while (!pbBuf)
     {
@@ -5014 +5060 @@
      * Allocate a big buffer we can play around with.  Min size is 1MB.
      */
-    size_t   cbBuf = cbFile < _64M ? (size_t)cbFile : _64M;
-    uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBuf);
+    size_t   cbMaxBuf = RT_MIN(_64M, g_cbMaxBuffer);
+    size_t   cbBuf    = cbFile < cbMaxBuf ? (size_t)cbFile : cbMaxBuf;
+    uint8_t *pbBuf    = (uint8_t *)RTMemPageAlloc(cbBuf);
     while (!pbBuf)
     {
@@ -5412 +5459 @@
                corruption of shared data during content checking of the RW iterations. */
             fsPerfFillWriteBuf(0, pbMapping, _2M, 0xf7);
-            if (enmState == kMMap_ReadWrite)
+            if (enmState == kMMap_ReadWrite && g_fMMapCoherency)
             {
                 /* For RW we can try read back from the file handle and check if we get
@@ -5427 +5474 @@
                 RTTESTI_CHECK(msync(pbMapping, _2M, MS_SYNC) == 0);
 # endif
-
-                /*
-                 * Time modifying and flushing a few different number of pages.
-                 */
+            }
+
+            /*
+             * Time modifying and flushing a few different number of pages.
+             */
+            if (enmState == kMMap_ReadWrite)
+            {
                 static size_t const s_acbFlush[] = { PAGE_SIZE, PAGE_SIZE * 2, PAGE_SIZE * 3, PAGE_SIZE * 8, PAGE_SIZE * 16, _2M };
                 for (unsigned iFlushSize = 0 ; iFlushSize < RT_ELEMENTS(s_acbFlush); iFlushSize++)
@@ -5451 +5501 @@
                     if (!g_fIgnoreNoCache || hFileNoCache != NIL_RTFILE)
                     {
-                        size_t   cbBuf = _2M;
+                        size_t   cbBuf = RT_MIN(_2M, g_cbMaxBuffer);
                         uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBuf);
                         if (!pbBuf)
@@ -5505 +5555 @@
          * when not performed thru an no-cache handle.
          */
-        if (enmState == kMMap_ReadOnly || enmState == kMMap_ReadWrite)
-        {
-            size_t   cbBuf = RT_MIN(_2M, cbMapping / 2);
+        if (   (enmState == kMMap_ReadOnly || enmState == kMMap_ReadWrite)
+            && g_fMMapCoherency)
+        {
+            size_t   cbBuf = RT_MIN(RT_MIN(_2M, cbMapping / 2), g_cbMaxBuffer);
             uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBuf);
             if (!pbBuf)
@@ -5737 +5788 @@
             fsPerfIoSeek(hFile1, cbFile);
 
+        if (g_fMMap && g_iMMapPlacement < 0)
+        {
+            fsPerfMMap(hFile1, hFileNoCache, cbFile);
+            fsPerfReinitFile(hFile1, cbFile);
+        }
+
         if (g_fReadTests)
             fsPerfRead(hFile1, hFileNoCache, cbFile);
@@ -5750 +5807 @@
             fsPerfSpliceToPipe(hFile1, cbFile);
 #endif
-        if (g_fMMap)
+        if (g_fMMap && g_iMMapPlacement == 0)
             fsPerfMMap(hFile1, hFileNoCache, cbFile);
 
@@ -5765 +5822 @@
         if (g_fFSync)
             fsPerfFSync(hFile1, cbFile);
+
+        if (g_fMMap && g_iMMapPlacement > 0)
+        {
+            fsPerfReinitFile(hFile1, cbFile);
+            fsPerfMMap(hFile1, hFileNoCache, cbFile);
+        }
     }
 
@@ -6232 +6295 @@
             case kCmdOpt_ManyTreeSubdirsPerDir: pszHelp = "Count of subdirs per directory in test tree. default: 16"; break;
             case kCmdOpt_ManyTreeDepth:         pszHelp = "Depth of test tree (not counting root).      default: 1"; break;
+#if defined(RT_OS_WINDOWS)
+            case kCmdOpt_MaxBufferSize:         pszHelp = "For avoiding the MDL limit on windows.       default: 32MiB"; break;
+#else
+            case kCmdOpt_MaxBufferSize:         pszHelp = "For avoiding the MDL limit on windows.       default: 0"; break;
+#endif
+            case kCmdOpt_MMapPlacement:         pszHelp = "When to do mmap testing (caching effects): first, between (default), last "; break;
             case kCmdOpt_IgnoreNoCache:         pszHelp = "Ignore error wrt no-cache handle.            default: --no-ignore-no-cache"; break;
             case kCmdOpt_NoIgnoreNoCache:       pszHelp = "Do not ignore error wrt no-cache handle.     default: --no-ignore-no-cache"; break;
@@ -6381 +6450 @@
                 g_fFSync                = true;
                 g_fMMap                 = true;
+                g_fMMapCoherency        = true;
                 g_fCopy                 = true;
                 g_fRemote               = true;
@@ -6418 +6488 @@
                 g_fFSync                = false;
                 g_fMMap                 = false;
+                g_fMMapCoherency        = false;
                 g_fCopy                 = false;
                 g_fRemote               = false;
@@ -6456 +6527 @@
             CASE_OPT(FSync);
             CASE_OPT(MMap);
+            CASE_OPT(MMapCoherency);
             CASE_OPT(IgnoreNoCache);
             CASE_OPT(Copy);
@@ -6502 +6574 @@
                 RTTestFailed(g_hTest, "Out of range --tree-depth value: %u (%#x)\n", ValueUnion.u32, ValueUnion.u32);
                 return RTTestSummaryAndDestroy(g_hTest);
+
+            case kCmdOpt_MaxBufferSize:
+                if (ValueUnion.u32 >= 4096)
+                    g_cbMaxBuffer = ValueUnion.u32;
+                else if (ValueUnion.u32 == 0)
+                    g_cbMaxBuffer = UINT32_MAX;
+                else
+                {
+                    RTTestFailed(g_hTest, "max buffer size is less than 4KB: %#x\n", ValueUnion.u32);
+                    return RTTestSummaryAndDestroy(g_hTest);
+                }
+                break;
 
             case kCmdOpt_IoFileSize:
@@ -6534 +6618 @@
                 }
                 return RTTestSummaryAndDestroy(g_hTest);
+
+            case kCmdOpt_MMapPlacement:
+                if (strcmp(ValueUnion.psz, "first") == 0)
+                    g_iMMapPlacement = -1;
+                else if (   strcmp(ValueUnion.psz, "between") == 0
+                         || strcmp(ValueUnion.psz, "default") == 0)
+                    g_iMMapPlacement = 0;
+                else if (strcmp(ValueUnion.psz, "last") == 0)
+                    g_iMMapPlacement = 1;
+                else
+                {
+                    RTTestFailed(g_hTest,
+                                 "Invalid --mmap-placment directive '%s'! Expected 'first', 'last', 'between' or 'default'.\n",
+                                 ValueUnion.psz);
+                    return RTTestSummaryAndDestroy(g_hTest);
+                }
+                break;
 
             case 'q':