From nobody Tue Feb 10 05:41:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55151+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55151+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583134198; cv=none; d=zohomail.com; s=zohoarc; b=TlouEwRbXn5TIIvLds3VhgtnAORzY2eHuHFS61UXkol3IdKhQ8yKFOLV942e3f96Y2zdLbUqCZQMGE4S1mZC1yw3tiEAE5zl9K0umnBj3qIa8H2IZyblSoM7X4bPV4G6PtiegImAULLiocjcKLuMArbAEq4DRhtRmU2bMkGSmRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583134198; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=wh4VSh0dfDmiRIevoWMSZnFoeiug0ZdFVsos8qiWlcE=; b=XNX5IocVv8NXrGq7ycKjzmzf6gYL9h7IcbceWmVaceP4bFYvioph8TeUXLVLRmhkcYqZgu+FLhwXQqGbKLVMptgsWVR8+GgMObGfIWT5SmsrwPBXhJFs+zZlXu3/rsSTsWI4p58juwIeKeTb4PcL/jHEF8Dv3vOdKHCeoXcbKtg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55151+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158313419836393.59021599118012; Sun, 1 Mar 2020 23:29:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id nySBYY1788612xIdJI8buD7L; Sun, 01 Mar 2020 23:29:57 -0800 X-Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web12.10945.1583134196557642091 for ; Sun, 01 Mar 2020 23:29:56 -0800 X-Received: by mail-wm1-f65.google.com with SMTP id z12so9834645wmi.4 for ; Sun, 01 Mar 2020 23:29:56 -0800 (PST) X-Gm-Message-State: 62FdMQPj2vdN8bocnQZCnC2Gx1787277AA= X-Google-Smtp-Source: ADFU+vulRVLrN3kpcaDPEu0pA/o449gsPlP7N4X9BLsBYzbR0KAzL2a+/S5qsqx3FlTosxhghI5tBg== X-Received: by 2002:a1c:4681:: with SMTP id t123mr9425671wma.86.1583134194867; Sun, 01 Mar 2020 23:29:54 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id z131sm6347153wmg.25.2020.03.01.23.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 23:29:54 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [edk2-devel] [PATCH 12/13] OvmfPkg/QemuKernelLoaderFsDxe: add support for new Linux initrd device path Date: Mon, 2 Mar 2020 08:29:35 +0100 Message-Id: <20200302072936.29221-13-ard.biesheuvel@linaro.org> In-Reply-To: <20200302072936.29221-1-ard.biesheuvel@linaro.org> References: <20200302072936.29221-1-ard.biesheuvel@linaro.org> 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,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583134197; bh=c1Cz9+kzDvIvEMekjWWir8l4HkVacQB8qxNaAvGYyKY=; h=Cc:Date:From:Reply-To:Subject:To; b=EG6k/eKoUd/9Q58n3q6WNhynAw3ktj7nRaqx7UFvTR+pi+rgEJmDyHaWobjMqgw5fpG s4ws3oj9dZT5K6S+Vf88uIlm7rhrZjkgfMxtu14zpnqFnZkHZuZW9+XfYGo1LWCASzIkh QmPfpu6oLZvWjKssxrA5zpkCasfhy+fro4Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Linux v5.7 will introduce a new method to load the initial ramdisk (initrd) from the loader, using the LoadFile2 protocol installed on a special vendor GUIDed media device path. Add support for this to our QEMU command line kernel/initrd loader. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2566 Signed-off-by: Ard Biesheuvel --- OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c | 79 +++++++++++++= +++++++ OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf | 2 + 2 files changed, 81 insertions(+) diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPk= g/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c index 77d8fedb738a..415946edf22a 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c @@ -13,15 +13,18 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include #include #include +#include #include =20 // @@ -84,6 +87,19 @@ STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mFileSystemDev= icePath =3D { } }; =20 +STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mInitrdDevicePath =3D { + { + { + MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, + { sizeof (VENDOR_DEVICE_PATH) } + }, + LINUX_EFI_INITRD_MEDIA_GUID + }, { + END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, + { sizeof (EFI_DEVICE_PATH_PROTOCOL) } + } +}; + // // The "file in the EFI stub filesystem" abstraction. // @@ -839,6 +855,48 @@ STATIC CONST EFI_SIMPLE_FILE_SYSTEM_PROTOCOL mFileSyst= em =3D { StubFileSystemOpenVolume }; =20 +STATIC +EFI_STATUS +EFIAPI +InitrdLoadFile2 ( + IN EFI_LOAD_FILE2_PROTOCOL *This, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, + IN BOOLEAN BootPolicy, + IN OUT UINTN *BufferSize, + IN VOID *Buffer OPTIONAL + ) +{ + CONST KERNEL_BLOB *InitrdBlob =3D &mKernelBlob[KernelBlobTypeInitrd]; + + ASSERT (InitrdBlob->Size > 0); + + if (BootPolicy) { + return EFI_UNSUPPORTED; + } + + if (BufferSize =3D=3D NULL || !IsDevicePathValid (FilePath, 0)) { + return EFI_INVALID_PARAMETER; + } + + if (FilePath->Type !=3D END_DEVICE_PATH_TYPE || + FilePath->SubType !=3D END_ENTIRE_DEVICE_PATH_SUBTYPE) { + return EFI_NOT_FOUND; + } + + if (Buffer =3D=3D NULL || *BufferSize < InitrdBlob->Size) { + *BufferSize =3D InitrdBlob->Size; + return EFI_BUFFER_TOO_SMALL; + } + + CopyMem (Buffer, InitrdBlob->Data, InitrdBlob->Size); + + *BufferSize =3D InitrdBlob->Size; + return EFI_SUCCESS; +} + +STATIC CONST EFI_LOAD_FILE2_PROTOCOL mInitrdLoadFile2 =3D { + InitrdLoadFile2, +}; =20 // // Utility functions. @@ -945,6 +1003,7 @@ QemuKernelLoaderFsDxeEntrypoint ( KERNEL_BLOB *KernelBlob; EFI_STATUS Status; EFI_HANDLE FileSystemHandle; + EFI_HANDLE InitrdLoadFile2Handle; =20 if (!QemuFwCfgIsAvailable ()) { return EFI_NOT_FOUND; @@ -989,8 +1048,28 @@ QemuKernelLoaderFsDxeEntrypoint ( goto FreeBlobs; } =20 + if (KernelBlob[KernelBlobTypeInitrd].Size > 0) { + InitrdLoadFile2Handle =3D NULL; + Status =3D gBS->InstallMultipleProtocolInterfaces (&InitrdLoadFile2Han= dle, + &gEfiDevicePathProtocolGuid, &mInitrdDevicePath, + &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2, + NULL); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces(): %r\n", + __FUNCTION__, Status)); + goto UninstallFileSystemHandle; + } + } + return EFI_SUCCESS; =20 +UninstallFileSystemHandle: + Status =3D gBS->UninstallMultipleProtocolInterfaces (FileSystemHandle, + &gEfiDevicePathProtocolGuid, &mFileSystemDevicePat= h, + &gEfiSimpleFileSystemProtocolGuid, &mFileSystem, + NULL); + ASSERT_EFI_ERROR (Status); + FreeBlobs: while (BlobType > 0) { CurrentBlob =3D &mKernelBlob[--BlobType]; diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/Ovmf= Pkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf index f4b50c265027..737f9b87a7c7 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf @@ -28,6 +28,7 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib + DevicePathLib MemoryAllocationLib UefiBootServicesTableLib QemuFwCfgLib @@ -42,6 +43,7 @@ [Guids] =20 [Protocols] gEfiDevicePathProtocolGuid ## PRODUCES + gEfiLoadFile2ProtocolGuid ## PRODUCES gEfiSimpleFileSystemProtocolGuid ## PRODUCES =20 [Depex] --=20 2.17.1 -=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 (#55151): https://edk2.groups.io/g/devel/message/55151 Mute This Topic: https://groups.io/mt/71669026/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-