From nobody Mon Feb 9 09:33:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+69055+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69055+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608158277; cv=none; d=zohomail.com; s=zohoarc; b=U0IHDG7is8n0+mkGNi+p9WqjwsIAi8x4n2N2ITsrp0FWUT6BOtusWKf5DRFN/AKCg9d1Cvv84ZCYBM8JdM0esK3wIQXMDAnLwQZ/uvym6MZEkUGOccjXfrsIh9kj7esqGopF4EgG1M/DegNW+6Wh2SNW3sMyzzQubZDwdmff/J0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608158277; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=wTSZhfOUJ0kv68+r2N7BlyPi1A6E4DfwkmMLmijkr6c=; b=CJ+tkOZYDw4sF8/Rx/Br4hLRP1mntJFncukFGRa7T6F+e11bNUJplVrk3ETFZL9iIUig/QNstJ6kNuiq5Zl3HgW/MeI9CEM5QPQY4qUlHijlDNAhSwQ0bAHvPn3Oykjj5A5dN+RLN+OJa9RQbzY8k8UyLjH/shkeDmdVrvWqjs4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69055+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1608158277199950.4625629060907; Wed, 16 Dec 2020 14:37:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id dDioYY1788612xi0BiItjEZw; Wed, 16 Dec 2020 14:37:55 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web11.4895.1608158275094077627 for ; Wed, 16 Dec 2020 14:37:55 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-E697Va0fMD-38jPQTgV5Vw-1; Wed, 16 Dec 2020 17:37:52 -0500 X-MC-Unique: E697Va0fMD-38jPQTgV5Vw-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 308A259; Wed, 16 Dec 2020 22:37:51 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-152.ams2.redhat.com [10.36.114.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9169660C9C; Wed, 16 Dec 2020 22:37:46 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io, virtio-fs@redhat.com, lersek@redhat.com Cc: Ard Biesheuvel , Jordan Justen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [edk2 PATCH 41/48] OvmfPkg/VirtioFsDxe: implement the wrapper function for FUSE_RENAME2 Date: Wed, 16 Dec 2020 22:11:18 +0100 Message-Id: <20201216211125.19496-42-lersek@redhat.com> In-Reply-To: <20201216211125.19496-1-lersek@redhat.com> References: <20201216211125.19496-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: 3lbIJ0dumUpXoovhSu0ZwInSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608158275; bh=wTSZhfOUJ0kv68+r2N7BlyPi1A6E4DfwkmMLmijkr6c=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=aW68QWH7+8dGJasURp4rL/CCT2L3YFICM/Esxjl7a60zUCnCv/oTBAuFwFlycrjyMvz LN+wOD1o7sWJ738bZcnIlBYCRh8qgxgzv+vxNk5QZpHl+UbIMmd7NarrZy5BGoLQGT8LC pT9WKPsOyhvCW7H90CtkDSP/Jqu2FK+hP5I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add the VirtioFsFuseRename() function, for sending the FUSE_RENAME2 command to the Virtio Filesystem device. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3097 Signed-off-by: Laszlo Ersek --- OvmfPkg/Include/IndustryStandard/VirtioFs.h | 15 +++ OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf | 1 + OvmfPkg/VirtioFsDxe/VirtioFsDxe.h | 9 ++ OvmfPkg/VirtioFsDxe/FuseRename.c | 131 ++++++++++++++++++++ 4 files changed, 156 insertions(+) diff --git a/OvmfPkg/Include/IndustryStandard/VirtioFs.h b/OvmfPkg/Include/= IndustryStandard/VirtioFs.h index 0b7b3ff80edd..0b2ed7010046 100644 --- a/OvmfPkg/Include/IndustryStandard/VirtioFs.h +++ b/OvmfPkg/Include/IndustryStandard/VirtioFs.h @@ -136,16 +136,21 @@ typedef struct { ((Namelen) =3D=3D 0 || (Namelen) > SIZE_4KB ? \ (UINTN)0 : \ ALIGN_VALUE ( \ sizeof (VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE) + (UINTN)(Namelen), \ sizeof (UINT64) \ ) \ ) =20 +// +// Flags for VirtioFsFuseOpRename2. +// +#define VIRTIO_FS_FUSE_RENAME2_REQ_F_NOREPLACE BIT0 + // // FUSE operation codes. // typedef enum { VirtioFsFuseOpLookup =3D 1, VirtioFsFuseOpForget =3D 2, VirtioFsFuseOpGetAttr =3D 3, VirtioFsFuseOpMkDir =3D 9, @@ -159,16 +164,17 @@ typedef enum { VirtioFsFuseOpFsync =3D 20, VirtioFsFuseOpFlush =3D 25, VirtioFsFuseOpInit =3D 26, VirtioFsFuseOpOpenDir =3D 27, VirtioFsFuseOpReleaseDir =3D 29, VirtioFsFuseOpFsyncDir =3D 30, VirtioFsFuseOpCreate =3D 35, VirtioFsFuseOpReadDirPlus =3D 44, + VirtioFsFuseOpRename2 =3D 45, } VIRTIO_FS_FUSE_OPCODE; =20 #pragma pack (1) // // Request-response headers common to all request types. // typedef struct { UINT32 Len; @@ -393,11 +399,20 @@ typedef struct { typedef struct { VIRTIO_FS_FUSE_NODE_RESPONSE NodeResp; VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE AttrResp; UINT64 NodeId; UINT64 CookieForNextEntry; UINT32 Namelen; UINT32 Type; } VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE; + +// +// Header for VirtioFsFuseOpRename2. +// +typedef struct { + UINT64 NewDir; + UINT32 Flags; + UINT32 Padding; +} VIRTIO_FS_FUSE_RENAME2_REQUEST; #pragma pack () =20 #endif // VIRTIO_FS_H_ diff --git a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf b/OvmfPkg/VirtioFsDxe/Virt= ioFsDxe.inf index 2c145da5f5ae..9dccd7d6a9ef 100644 --- a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf +++ b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -90,16 +90,17 @@ [Sources] FuseInit.c FuseLookup.c FuseMkDir.c FuseOpen.c FuseOpenDir.c FuseOpenOrCreate.c FuseRead.c FuseRelease.c + FuseRename.c FuseStatFs.c FuseUnlink.c FuseWrite.c Helpers.c SimpleFsClose.c SimpleFsDelete.c SimpleFsFlush.c SimpleFsGetInfo.c diff --git a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h b/OvmfPkg/VirtioFsDxe/Virtio= FsDxe.h index 132a63400527..9334e5434c51 100644 --- a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h +++ b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h @@ -391,16 +391,25 @@ EFI_STATUS VirtioFsFuseOpenOrCreate ( IN OUT VIRTIO_FS *VirtioFs, IN UINT64 ParentNodeId, IN CHAR8 *Name, OUT UINT64 *NodeId, OUT UINT64 *FuseHandle ); =20 +EFI_STATUS +VirtioFsFuseRename ( + IN OUT VIRTIO_FS *VirtioFs, + IN UINT64 OldParentNodeId, + IN CHAR8 *OldName, + IN UINT64 NewParentNodeId, + IN CHAR8 *NewName + ); + // // EFI_SIMPLE_FILE_SYSTEM_PROTOCOL member functions for the Virtio Filesys= tem // driver. // =20 EFI_STATUS EFIAPI VirtioFsOpenVolume ( diff --git a/OvmfPkg/VirtioFsDxe/FuseRename.c b/OvmfPkg/VirtioFsDxe/FuseRen= ame.c new file mode 100644 index 000000000000..fc9b27ccf6d4 --- /dev/null +++ b/OvmfPkg/VirtioFsDxe/FuseRename.c @@ -0,0 +1,131 @@ +/** @file + FUSE_RENAME2 wrapper for the Virtio Filesystem device. + + Copyright (C) 2020, Red Hat, Inc. + + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#include // AsciiStrSize() + +#include "VirtioFsDxe.h" + +/** + Rename a regular file or a directory, by sending the FUSE_RENAME2 reques= t to + the Virtio Filesystem device. If the new filename exists, the request wi= ll + fail. + + The function may only be called after VirtioFsFuseInitSession() returns + successfully and before VirtioFsUninit() is called. + + @param[in,out] VirtioFs The Virtio Filesystem device to send the + FUSE_RENAME2 request to. On output, the FUSE + request counter "VirtioFs->RequestId" will h= ave + been incremented. + + @param[in] OldParentNodeId The inode number of the directory in which + OldName should be removed. + + @param[in] OldName The single-component filename to remove in t= he + directory identified by OldParentNodeId. + + @param[in] NewParentNodeId The inode number of the directory in which + NewName should be created, such that on + successful return, (NewParentNodeId, NewName) + refer to the same inode as (OldParentNodeId, + OldName) did on entry. + + @param[in] NewName The single-component filename to create in t= he + directory identified by NewParentNodeId. + + @retval EFI_SUCCESS The file or directory has been renamed. + + @return The "errno" value mapped to an EFI_STATUS code, if = the + Virtio Filesystem device explicitly reported an err= or. + + @return Error codes propagated from VirtioFsSgListsValidate= (), + VirtioFsFuseNewRequest(), VirtioFsSgListsSubmit(), + VirtioFsFuseCheckResponse(). +**/ +EFI_STATUS +VirtioFsFuseRename ( + IN OUT VIRTIO_FS *VirtioFs, + IN UINT64 OldParentNodeId, + IN CHAR8 *OldName, + IN UINT64 NewParentNodeId, + IN CHAR8 *NewName + ) +{ + VIRTIO_FS_FUSE_REQUEST CommonReq; + VIRTIO_FS_FUSE_RENAME2_REQUEST Rename2Req; + VIRTIO_FS_IO_VECTOR ReqIoVec[4]; + VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList; + VIRTIO_FS_FUSE_RESPONSE CommonResp; + VIRTIO_FS_IO_VECTOR RespIoVec[1]; + VIRTIO_FS_SCATTER_GATHER_LIST RespSgList; + EFI_STATUS Status; + + // + // Set up the scatter-gather lists. + // + ReqIoVec[0].Buffer =3D &CommonReq; + ReqIoVec[0].Size =3D sizeof CommonReq; + ReqIoVec[1].Buffer =3D &Rename2Req; + ReqIoVec[1].Size =3D sizeof Rename2Req; + ReqIoVec[2].Buffer =3D OldName; + ReqIoVec[2].Size =3D AsciiStrSize (OldName); + ReqIoVec[3].Buffer =3D NewName; + ReqIoVec[3].Size =3D AsciiStrSize (NewName); + ReqSgList.IoVec =3D ReqIoVec; + ReqSgList.NumVec =3D ARRAY_SIZE (ReqIoVec); + + RespIoVec[0].Buffer =3D &CommonResp; + RespIoVec[0].Size =3D sizeof CommonResp; + RespSgList.IoVec =3D RespIoVec; + RespSgList.NumVec =3D ARRAY_SIZE (RespIoVec); + + // + // Validate the scatter-gather lists; calculate the total transfer sizes. + // + Status =3D VirtioFsSgListsValidate (VirtioFs, &ReqSgList, &RespSgList); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Populate the common request header. + // + Status =3D VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.Total= Size, + VirtioFsFuseOpRename2, OldParentNodeId); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Populate the FUSE_RENAME2-specific fields. + // + Rename2Req.NewDir =3D NewParentNodeId; + Rename2Req.Flags =3D VIRTIO_FS_FUSE_RENAME2_REQ_F_NOREPLACE; + Rename2Req.Padding =3D 0; + + // + // Submit the request. + // + Status =3D VirtioFsSgListsSubmit (VirtioFs, &ReqSgList, &RespSgList); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Verify the response (all response buffers are fixed size). + // + Status =3D VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NUL= L); + if (Status =3D=3D EFI_DEVICE_ERROR) { + DEBUG ((DEBUG_ERROR, "%a: Label=3D\"%s\" OldParentNodeId=3D%Lu OldName= =3D\"%a\" " + "NewParentNodeId=3D%Lu NewName=3D\"%a\" Errno=3D%d\n", __FUNCTION__, + VirtioFs->Label, OldParentNodeId, OldName, NewParentNodeId, NewName, + CommonResp.Error)); + Status =3D VirtioFsErrnoToEfiStatus (CommonResp.Error); + } + return Status; +} --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#69055): https://edk2.groups.io/g/devel/message/69055 Mute This Topic: https://groups.io/mt/79024401/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-