OvmfPkg/VirtioFsDxe: add EFI_FILE_INFO cache fields to VIRTIO_FS_FILE

For reading through a directory stream with tolerable performance, we'll
have to call FUSE_READDIRPLUS each time with such a buffer that can
deliver a good number of variable size records
(VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE elements). Every time we'll do that,
we'll turn the whole bunch into an array of EFI_FILE_INFOs immediately.
EFI_FILE_PROTOCOL.Read() invocations (on directories) will be served from
this EFI_FILE_INFO cache.

Add the fields for the EFI_FILE_INFO cache to VIRTIO_FS_FILE:
- initialize them in Open() and OpenVolume(),
- release the cache in Close() and Delete(),
- also release the cache when the directory is rewound, in SetPosition().

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3097
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20201216211125.19496-36-lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsClose.c b/OvmfPkg/VirtioFsDxe/SimpleFsClose.c
index 04b4f2c382d7cbcc033c67a0fa95fa24a3b4d7b6..4c1cf52112cea2afefd23f0a30228e01d5e61dc9 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsClose.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsClose.c
@@ -60,6 +60,9 @@ VirtioFsSimpleFileClose (
   RemoveEntryList (&VirtioFsFile->OpenFilesEntry);\r
 \r
   FreePool (VirtioFsFile->CanonicalPathname);\r
+  if (VirtioFsFile->FileInfoArray != NULL) {\r
+    FreePool (VirtioFsFile->FileInfoArray);\r
+  }\r
   FreePool (VirtioFsFile);\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsDelete.c b/OvmfPkg/VirtioFsDxe/SimpleFsDelete.c
index 76cfee5bceb1f37c450030407f29f2678c375c30..76a868b3c24df182281a34780fb7df3fa4fc68bc 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsDelete.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsDelete.c
@@ -102,6 +102,9 @@ VirtioFsSimpleFileDelete (
   RemoveEntryList (&VirtioFsFile->OpenFilesEntry);\r
 \r
   FreePool (VirtioFsFile->CanonicalPathname);\r
+  if (VirtioFsFile->FileInfoArray != NULL) {\r
+    FreePool (VirtioFsFile->FileInfoArray);\r
+  }\r
   FreePool (VirtioFsFile);\r
   return Status;\r
 }\r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
index 7c50ce9c0e7656b2f86420300d826dafa32ab026..d73d23fe866568f59b7c8347dca3229c13709d15 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
@@ -482,6 +482,10 @@ VirtioFsSimpleFileOpen (
   NewVirtioFsFile->FilePosition           = 0;\r
   NewVirtioFsFile->NodeId                 = NewNodeId;\r
   NewVirtioFsFile->FuseHandle             = NewFuseHandle;\r
+  NewVirtioFsFile->FileInfoArray          = NULL;\r
+  NewVirtioFsFile->SingleFileInfoSize     = 0;\r
+  NewVirtioFsFile->NumFileInfo            = 0;\r
+  NewVirtioFsFile->NextFileInfo           = 0;\r
 \r
   //\r
   // One more file is now open for the filesystem.\r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c b/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
index 1181191d271b61b1863af7f1a6da4c219a1228f7..058e7a41ab03ab6f0af1aede068c57462a2f5c38 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
@@ -75,6 +75,10 @@ VirtioFsOpenVolume (
   VirtioFsFile->FilePosition           = 0;\r
   VirtioFsFile->NodeId                 = VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID;\r
   VirtioFsFile->FuseHandle             = RootDirHandle;\r
+  VirtioFsFile->FileInfoArray          = NULL;\r
+  VirtioFsFile->SingleFileInfoSize     = 0;\r
+  VirtioFsFile->NumFileInfo            = 0;\r
+  VirtioFsFile->NextFileInfo           = 0;\r
 \r
   //\r
   // One more file open for the filesystem.\r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c b/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
index ac62853026529cd101e2ae43c558c2e4e122c69c..a548012d9c09cc2d04d898c47aefc4a4350ee775 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
@@ -7,6 +7,8 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
+#include <Library/MemoryAllocationLib.h> // FreePool()\r
+\r
 #include "VirtioFsDxe.h"\r
 \r
 EFI_STATUS\r
@@ -31,6 +33,13 @@ VirtioFsSimpleFileSetPosition (
       return EFI_UNSUPPORTED;\r
     }\r
     VirtioFsFile->FilePosition = 0;\r
+    if (VirtioFsFile->FileInfoArray != NULL) {\r
+      FreePool (VirtioFsFile->FileInfoArray);\r
+      VirtioFsFile->FileInfoArray = NULL;\r
+    }\r
+    VirtioFsFile->SingleFileInfoSize = 0;\r
+    VirtioFsFile->NumFileInfo        = 0;\r
+    VirtioFsFile->NextFileInfo       = 0;\r
     return EFI_SUCCESS;\r
   }\r
 \r

diff --git a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
index 2b419048c23225e2829f3ba456de707068d09c75..a704acdd520e4a3dfc23f7b61566dd6099b4a9d7 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
+++ b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
@@ -47,6 +47,11 @@
 //\r
 #define VIRTIO_FS_MAX_PATHNAME_LENGTH ((UINTN)65535)\r
 \r
+//\r
+// Maximum value for VIRTIO_FS_FILE.NumFileInfo.\r
+//\r
+#define VIRTIO_FS_FILE_MAX_FILE_INFO 256\r
+\r
 //\r
 // Filesystem label encoded in UCS-2, transformed from the UTF-8 representation\r
 // in "VIRTIO_FS_CONFIG.Tag", and NUL-terminated. Only the printable ASCII code\r
@@ -154,6 +159,20 @@ typedef struct {
   //\r
   UINT64 NodeId;\r
   UINT64 FuseHandle;\r
+  //\r
+  // EFI_FILE_INFO objects cached for an in-flight directory read.\r
+  //\r
+  // For reading through a directory stream with tolerable performance, we have\r
+  // to call FUSE_READDIRPLUS each time with such a buffer that can deliver a\r
+  // good number of variable size records (VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE\r
+  // elements). Every time we do that, we turn the whole bunch into an array of\r
+  // EFI_FILE_INFOs immediately. EFI_FILE_PROTOCOL.Read() invocations (on\r
+  // directories) will be served from this EFI_FILE_INFO cache.\r
+  //\r
+  UINT8 *FileInfoArray;\r
+  UINTN SingleFileInfoSize;\r
+  UINTN NumFileInfo;\r
+  UINTN NextFileInfo;\r
 } VIRTIO_FS_FILE;\r
 \r
 #define VIRTIO_FS_FILE_FROM_SIMPLE_FILE(SimpleFileReference) \\r