Changeset 81506 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Oct 24, 2019 2:51:43 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134234

Message:

FlasCore: Experimental read cache, disabled. bugref:6940

Location:

trunk/src/VBox/Devices/EFI

Files:

• FlashCore.cpp (modified) (4 diffs)
• FlashCore.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FlashCore.cpp

@@ -127 +127 @@
 #ifdef IN_RING3
                     pThis->pbFlash[off] = bCmd;
+# ifdef FLASH_WITH_RZ_READ_CACHE_SIZE
+                    uint32_t const offInCache = off - pThis->offCache;
+                    if (offInCache < sizeof(pThis->CacheData) && pThis->offCache != UINT32_MAX)
+                        pThis->CacheData.ab[offInCache] = bCmd;
+# endif
+
                     /* NB: Writes are instant and never fail. */
                     LogFunc(("wrote byte to flash at %08RX32: %02X\n", off, bCmd));
@@ -217 +223 @@
 }
 
+#if defined(FLASH_WITH_RZ_READ_CACHE_SIZE) && defined(IN_RING3)
+/**
+ * Fills the RZ cache with data.
+ */
+DECL_FORCE_INLINE(void) flashFillRzCache(PFLASHCORE pThis, uint32_t off)
+{
+    AssertCompile(RT_IS_POWER_OF_TWO(sizeof(pThis->CacheData)));
+    uint32_t const offCache = (off + 1) & ~(sizeof(pThis->CacheData) - 1);
+    if (offCache < pThis->cbFlashSize)
+    {
+        Log2(("flashMemReadByte: Filling RZ cache: offset %#x\n", offCache));
+# if FLASH_WITH_RZ_READ_CACHE_SIZE < 8
+        uint64_t const * const pu64Src = ((uint64_t const *)&pThis->pbFlash[offCache]);
+        pThis->CacheData.au64[0]  = pu64Src[0];
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 1
+        pThis->CacheData.au64[1]  = pu64Src[1];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 2
+        pThis->CacheData.au64[2]  = pu64Src[2];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 3
+        pThis->CacheData.au64[3]  = pu64Src[3];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 4
+        pThis->CacheData.au64[4]  = pu64Src[4];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 5
+        pThis->CacheData.au64[5]  = pu64Src[5];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 6
+        pThis->CacheData.au64[6]  = pu64Src[6];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 7
+        pThis->CacheData.au64[7]  = pu64Src[7];
+#  endif
+#  if FLASH_WITH_RZ_READ_CACHE_SIZE > 8
+        pThis->CacheData.au64[8]  = pu64Src[8];
+#  endif
+# else
+        memcpy(pThis->CacheData.ab, &pThis->pbFlash[offCache], sizeof(pThis->CacheData.ab));
+# endif
+        pThis->offCache           = offCache;
+    }
+}
+#endif /* FLASH_WITH_RZ_READ_CACHE_SIZE && IN_RING3 */
+
 /**
  * Worker for flashRead that deals with a single byte.
@@ -235 +287 @@
         case FLASH_CMD_ARRAY_READ:
             if (off < pThis->cbFlashSize)
+            {
 #ifdef IN_RING3
+# ifdef FLASH_WITH_RZ_READ_CACHE_SIZE
+                AssertCompile(RT_IS_POWER_OF_TWO(sizeof(pThis->CacheData)));
+                if (off + 1 - pThis->offCache < sizeof(pThis->CacheData) && pThis->offCache != UINT32_MAX)
+                { }
+                else
+                    flashFillRzCache(pThis, off);
+# endif
                 bValue = pThis->pbFlash[off];
 #else
+# ifdef FLASH_WITH_RZ_READ_CACHE_SIZE
+                uint32_t const offInCache = off - pThis->offCache;
+                if (offInCache < sizeof(pThis->CacheData) && pThis->offCache != UINT32_MAX)
+                {
+                    Log2(("flashMemReadByte: cache hit (at %#RX32 in cache)\n", offInCache));
+                    bValue = pThis->CacheData.ab[offInCache];
+                }
+                else
+                {
+                    Log2(("flashMemReadByte: cache miss: offInCache=%#RX32 offCache=%#RX32\n", offInCache, pThis->offCache));
+                    return VINF_IOM_R3_MMIO_READ;
+                }
+# else
                 return VINF_IOM_R3_MMIO_READ;
+# endif
 #endif
+            }
             else
                 bValue = 0xff; /* Play safe and return the default value of non initialized flash. */
@@ -319 +394 @@
     pThis->cbBlockSize = cbBlock;
     pThis->cbFlashSize = cbFlash;
+#ifdef FLASH_WITH_RZ_READ_CACHE_SIZE
+    pThis->offCache    = UINT32_MAX;
+#endif
 
     /* Set up the flash data. */

trunk/src/VBox/Devices/EFI/FlashCore.h

@@ -48 +48 @@
 #define FLASH_SAVED_STATE_VERSION           1
 
+#if 0
+/** Enables the ring-0/raw-mode read cache optimization, giving the size in
+ *  uint64_t units. */
+#define FLASH_WITH_RZ_READ_CACHE_SIZE       32
+#endif
+
 
 /*********************************************************************************************************************************
@@ -72 +78 @@
     /** The configured block size of the device. */
     uint16_t                cbBlockSize;
+    /** The actual flash memory data.  */
+    R3PTRTYPE(uint8_t *)    pbFlash;
     /** The flash memory region size.  */
     uint32_t                cbFlashSize;
-    /** The actual flash memory data.  */
-    R3PTRTYPE(uint8_t *)    pbFlash;
     /** @} */
+
+#ifdef FLASH_WITH_RZ_READ_CACHE_SIZE
+    /** @name Read cache for non-ring-3 code.
+     * @{ */
+    /** The cache offset, UINT32_MAX if invalid. */
+    uint32_t                offCache;
+# if ARCH_BITS == 32
+    uint32_t                uPadding;
+# endif
+    /** The cache data. */
+    union
+    {
+        uint64_t            au64[FLASH_WITH_RZ_READ_CACHE_SIZE];
+        uint8_t             ab[FLASH_WITH_RZ_READ_CACHE_SIZE * 8];
+    } CacheData;
+    /** @} */
+#endif
 } FLASHCORE;