OvmfPkg/VirtioFsDxe: implement EFI_FILE_PROTOCOL.GetPosition, .SetPosition

Using the functions introduced previously, we can now implement
VirtioFsSimpleFileGetPosition() and VirtioFsSimpleFileSetPosition().

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-32-lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsGetPosition.c b/OvmfPkg/VirtioFsDxe/SimpleFsGetPosition.c
index 2f40d2be26936b27b43ec03f621afa9914709a21..53212621e97045354146f64f74aeba5892707ded 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsGetPosition.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsGetPosition.c
@@ -16,5 +16,12 @@ VirtioFsSimpleFileGetPosition (
      OUT UINT64            *Position\r
   )\r
 {\r
-  return EFI_DEVICE_ERROR;\r
+  VIRTIO_FS_FILE *VirtioFsFile;\r
+\r
+  VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
+  if (VirtioFsFile->IsDirectory) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+  *Position = VirtioFsFile->FilePosition;\r
+  return EFI_SUCCESS;\r
 }\r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
index 2649c796ac970dd85413eec277605e70831767de..7c50ce9c0e7656b2f86420300d826dafa32ab026 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
@@ -479,6 +479,7 @@ VirtioFsSimpleFileOpen (
   NewVirtioFsFile->IsOpenForWriting       = OpenForWriting;\r
   NewVirtioFsFile->OwnerFs                = VirtioFs;\r
   NewVirtioFsFile->CanonicalPathname      = NewCanonicalPath;\r
+  NewVirtioFsFile->FilePosition           = 0;\r
   NewVirtioFsFile->NodeId                 = NewNodeId;\r
   NewVirtioFsFile->FuseHandle             = NewFuseHandle;\r
 \r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c b/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
index 9c0ab434c186698f544551aabf59435ae30b077d..1181191d271b61b1863af7f1a6da4c219a1228f7 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
@@ -72,6 +72,7 @@ VirtioFsOpenVolume (
   VirtioFsFile->IsOpenForWriting       = FALSE;\r
   VirtioFsFile->OwnerFs                = VirtioFs;\r
   VirtioFsFile->CanonicalPathname      = CanonicalPathname;\r
+  VirtioFsFile->FilePosition           = 0;\r
   VirtioFsFile->NodeId                 = VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID;\r
   VirtioFsFile->FuseHandle             = RootDirHandle;\r
 \r

diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c b/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
index ee8cb1f4e465282e1a58e94c819b59c9c0eaaf7e..ac62853026529cd101e2ae43c558c2e4e122c69c 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
+++ b/OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
@@ -16,5 +16,43 @@ VirtioFsSimpleFileSetPosition (
   IN UINT64            Position\r
   )\r
 {\r
-  return EFI_DEVICE_ERROR;\r
+  VIRTIO_FS_FILE                     *VirtioFsFile;\r
+  VIRTIO_FS                          *VirtioFs;\r
+  EFI_STATUS                         Status;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
+\r
+  VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
+\r
+  //\r
+  // Directories can only be rewound, per spec.\r
+  //\r
+  if (VirtioFsFile->IsDirectory) {\r
+    if (Position != 0) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+    VirtioFsFile->FilePosition = 0;\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  //\r
+  // Regular file.\r
+  //\r
+  if (Position < MAX_UINT64) {\r
+    //\r
+    // Caller is requesting absolute file position.\r
+    //\r
+    VirtioFsFile->FilePosition = Position;\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  //\r
+  // Caller is requesting a seek to EOF.\r
+  //\r
+  VirtioFs = VirtioFsFile->OwnerFs;\r
+  Status = VirtioFsFuseGetAttr (VirtioFs, VirtioFsFile->NodeId, &FuseAttr);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+  VirtioFsFile->FilePosition = FuseAttr.Size;\r
+  return EFI_SUCCESS;\r
 }\r

diff --git a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
index d1b746c0d8cf4927394b3256f895759d6738e031..948fcfb6b6f30751005e87a056950327b057a557 100644 (file)
--- a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
+++ b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
@@ -139,6 +139,7 @@ typedef struct {
   VIRTIO_FS         *OwnerFs;\r
   LIST_ENTRY        OpenFilesEntry;\r
   CHAR8             *CanonicalPathname;\r
+  UINT64            FilePosition;\r
   //\r
   // In the FUSE wire protocol, every request except FUSE_INIT refers to a\r
   // file, namely by the "VIRTIO_FS_FUSE_REQUEST.NodeId" field; that is, by the\r