From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web10.12365.1583414357396802100 for ; Thu, 05 Mar 2020 05:19:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aTLAHjGq; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583414356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VfvxJQUTyJmXN/DmG8B7uP8oexz+PNbaksGGPJFZti8=; b=aTLAHjGqiLYWbBL9dEaMKISDGINTs+Kvibn9CWpgsdxs5bKAomUofiFkz0TH7dcPXNzZRN pW7NDiby0UNvC9wo4ZkAfoM6dmRa4f2rQWnJc8eozsdzPTz0RW+yR89LaQPnC3oIifNYDa Xrv4oeYbpZjzDNh8FRpDBqrD5MAQk78= 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-328-UDdMin_DMrqkDIgOg4q0KQ-1; Thu, 05 Mar 2020 08:19:12 -0500 X-MC-Unique: UDdMin_DMrqkDIgOg4q0KQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69700800D50; Thu, 5 Mar 2020 13:19:11 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-216.ams2.redhat.com [10.36.117.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D9051001902; Thu, 5 Mar 2020 13:19:10 +0000 (UTC) Subject: Re: [PATCH v2 13/14] OvmfPkg/QemuKernelLoaderFsDxe: add support for new Linux initrd device path To: Ard Biesheuvel , devel@edk2.groups.io References: <20200304095233.21046-1-ard.biesheuvel@linaro.org> <20200304095233.21046-14-ard.biesheuvel@linaro.org> From: "Laszlo Ersek" Message-ID: <11e71b6d-4d7b-e935-59a6-2aae0b92e389@redhat.com> Date: Thu, 5 Mar 2020 14:19:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200304095233.21046-14-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 03/04/20 10:52, Ard Biesheuvel wrote: > 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=2566 > 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/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c > index 8ccb1983170c..f43b4c0db0ec 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 > > // > @@ -84,6 +87,19 @@ STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mFileSystemDevicePath = { > } > }; > > +STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mInitrdDevicePath = { > + { > + { > + 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 mFileSystem = { > StubFileSystemOpenVolume > }; > > +STATIC > +EFI_STATUS > +EFIAPI > +InitrdLoadFile2 ( > + IN EFI_LOAD_FILE2_PROTOCOL *This, > + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, > + IN BOOLEAN BootPolicy, > + IN OUT UINTN *BufferSize, (1) You might want to beautify the columns here, similarly to commit 2632178bc683 ("OvmfPkg: add 'initrd' shell command to expose Linux initrd via device path", 2020-03-04). Up to you. Reviewed-by: Laszlo Ersek Thanks Laszlo > + IN VOID *Buffer OPTIONAL > + ) > +{ > + CONST KERNEL_BLOB *InitrdBlob = &mKernelBlob[KernelBlobTypeInitrd]; > + > + ASSERT (InitrdBlob->Size > 0); > + > + if (BootPolicy) { > + return EFI_UNSUPPORTED; > + } > + > + if (BufferSize == NULL || !IsDevicePathValid (FilePath, 0)) { > + return EFI_INVALID_PARAMETER; > + } > + > + if (FilePath->Type != END_DEVICE_PATH_TYPE || > + FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE) { > + return EFI_NOT_FOUND; > + } > + > + if (Buffer == NULL || *BufferSize < InitrdBlob->Size) { > + *BufferSize = InitrdBlob->Size; > + return EFI_BUFFER_TOO_SMALL; > + } > + > + CopyMem (Buffer, InitrdBlob->Data, InitrdBlob->Size); > + > + *BufferSize = InitrdBlob->Size; > + return EFI_SUCCESS; > +} > + > +STATIC CONST EFI_LOAD_FILE2_PROTOCOL mInitrdLoadFile2 = { > + InitrdLoadFile2, > +}; > > // > // Utility functions. > @@ -949,6 +1007,7 @@ QemuKernelLoaderFsDxeEntrypoint ( > KERNEL_BLOB *KernelBlob; > EFI_STATUS Status; > EFI_HANDLE FileSystemHandle; > + EFI_HANDLE InitrdLoadFile2Handle; > > if (!QemuFwCfgIsAvailable ()) { > return EFI_NOT_FOUND; > @@ -993,8 +1052,28 @@ QemuKernelLoaderFsDxeEntrypoint ( > goto FreeBlobs; > } > > + if (KernelBlob[KernelBlobTypeInitrd].Size > 0) { > + InitrdLoadFile2Handle = NULL; > + Status = gBS->InstallMultipleProtocolInterfaces (&InitrdLoadFile2Handle, > + &gEfiDevicePathProtocolGuid, &mInitrdDevicePath, > + &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2, > + NULL); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces(): %r\n", > + __FUNCTION__, Status)); > + goto UninstallFileSystemHandle; > + } > + } > + > return EFI_SUCCESS; > > +UninstallFileSystemHandle: > + Status = gBS->UninstallMultipleProtocolInterfaces (FileSystemHandle, > + &gEfiDevicePathProtocolGuid, &mFileSystemDevicePath, > + &gEfiSimpleFileSystemProtocolGuid, &mFileSystem, > + NULL); > + ASSERT_EFI_ERROR (Status); > + > FreeBlobs: > while (BlobType > 0) { > CurrentBlob = &mKernelBlob[--BlobType]; > diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf > index 5ba88063def0..7b35adb8e034 100644 > --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf > +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf > @@ -28,6 +28,7 @@ [LibraryClasses] > BaseLib > BaseMemoryLib > DebugLib > + DevicePathLib > MemoryAllocationLib > QemuFwCfgLib > UefiBootServicesTableLib > @@ -42,6 +43,7 @@ [Guids] > > [Protocols] > gEfiDevicePathProtocolGuid ## PRODUCES > + gEfiLoadFile2ProtocolGuid ## PRODUCES > gEfiSimpleFileSystemProtocolGuid ## PRODUCES > > [Depex] >