From nobody Mon Apr 29 14:39:39 2024 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+54770+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+54770+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623562; cv=none; d=zohomail.com; s=zohoarc; b=QvsNET9XervXyC5LLO/T5EoFCo/LkLdNhq3LkSuIqFyZKC5bH1Ok3NhzuSq9ap7IQvqpNshl6iA6wgrMrknA3hK1FWNBD9xcGA0RdypuD9OCALiZNH1YAZ/Qtilq1V65QL84SeluX/SeupN5s180zVESiy0MV0rVX9GrYJ7a2nY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623562; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=4ybm+EZrV+5CQnPvqd0MAvwgfyPxE3OC5uWxY9o7tNc=; b=iMp0nhMSwbvSKS8+RmUfC1mMxPtHFt8pN+yi5mEhnXu+XPUFwCK6EaV/7szZ6rGnSOGtTFhNRKNKDh8TQ1HJEXEy5EIS87GNVwxkIX2WU1AAtMt7qP8+X7nKQFGm9HMNexvb5iT7u57mA9wytphtqqx9QjXXwZcKq2jKjz5q/Kw= 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+54770+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 1582623562577580.6577401439177; Tue, 25 Feb 2020 01:39:22 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id s2ZgYY1788612xTnjtDu36nT; Tue, 25 Feb 2020 01:39:21 -0800 X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web11.1475.1582623560393012338 for ; Tue, 25 Feb 2020 01:39:20 -0800 X-Received: by mail-wr1-f66.google.com with SMTP id p18so10211008wre.9 for ; Tue, 25 Feb 2020 01:39:20 -0800 (PST) X-Gm-Message-State: 0c4ioiG0VBeQ8bBxzTfauVFjx1787277AA= X-Google-Smtp-Source: APXvYqyqzkqilyaE5LUhyglKCgqO+Nn4jqYIjAyaGRzW+d1UrZiSicYA9KNeTc3zVAZH4JBidVU6Vw== X-Received: by 2002:adf:fcc4:: with SMTP id f4mr75575318wrs.247.1582623558610; Tue, 25 Feb 2020 01:39:18 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:17 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 1/6] OvmfPkg: add definition of LINUX_EFI_INITRD_MEDIA_GUID Date: Tue, 25 Feb 2020 10:39:03 +0100 Message-Id: <20200225093908.6707-2-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623561; bh=CDZKri7dyL0y+a57N1vEIDBp1JD3/Get+IdIXvnp0tA=; h=Cc:Date:From:Reply-To:Subject:To; b=OMReABOusZRspUPZXBBugkJHZuD4GdYLrEh8CbEdSlbAxcarYtXNGD5WPXwQYkPjpOG fVFcPJ4UBuv1UjyXeu5OcNE6dAe2iqA6s8d1KzXg2j7Puwu3oNQKEIYQHnKepkeZNuBJJ nVSu1UDOoVr+4n96ODdRHiKHWoTZMLFzGGQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add LINUX_EFI_INITRD_MEDIA_GUID to our collection of GUID definitions, it can be used in a media device path to specify a Linux style initrd that can be loaded by the OS using the LoadFile2 protocol. Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- OvmfPkg/Include/Guid/LinuxEfiInitrdMedia.h | 17 +++++++++++++++++ OvmfPkg/OvmfPkg.dec | 1 + 2 files changed, 18 insertions(+) diff --git a/OvmfPkg/Include/Guid/LinuxEfiInitrdMedia.h b/OvmfPkg/Include/G= uid/LinuxEfiInitrdMedia.h new file mode 100644 index 000000000000..83fc3fc79aa6 --- /dev/null +++ b/OvmfPkg/Include/Guid/LinuxEfiInitrdMedia.h @@ -0,0 +1,17 @@ +/** @file + GUID definition for the Linux Initrd media device path + + Copyright (c) 2020, Arm, Ltd. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#ifndef LINUX_EFI_INITRD_MEDIA_GUID_H__ +#define LINUX_EFI_INITRD_MEDIA_GUID_H__ + +#define LINUX_EFI_INITRD_MEDIA_GUID \ + {0x5568e427, 0x68fc, 0x4f3d, {0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, = 0x68}} + +extern EFI_GUID gLinuxEfiInitrdMediaGuid; + +#endif diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 4c5b6511cb97..6849a79cd8b0 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -86,6 +86,7 @@ [Guids] gMicrosoftVendorGuid =3D {0x77fa9abd, 0x0359, 0x4d32, {0x= bd, 0x60, 0x28, 0xf4, 0xe7, 0x8f, 0x78, 0x4b}} gEfiLegacyBiosGuid =3D {0x2E3044AC, 0x879F, 0x490F, {0x= 97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50}} gEfiLegacyDevOrderVariableGuid =3D {0xa56074db, 0x65fe, 0x45f7, {0x= bd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52}} + gLinuxEfiInitrdMediaGuid =3D {0x5568e427, 0x68fc, 0x4f3d, {0x= ac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68}} =20 [Protocols] gVirtioDeviceProtocolGuid =3D {0xfa920010, 0x6785, 0x4941, {0x= b6, 0xec, 0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a}} --=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 (#54770): https://edk2.groups.io/g/devel/message/54770 Mute This Topic: https://groups.io/mt/71530295/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- From nobody Mon Apr 29 14:39:39 2024 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+54771+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+54771+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623563; cv=none; d=zohomail.com; s=zohoarc; b=G3/dungW9CULlofkX5bDz/ohKrDocl/NQMo85DO4S0qKwCtJ7mSdbJGqUtOOb3zRne1uI24r/vh2DvHdNxnx+dOzSKFAe+ELvUbrAKmBFgPSvtCpYlPsrTSIBTUzy/Q0XQOA75GixGXgr3XeXVcOnTnd+GaCsBsP9i5D1IFvdZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623563; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=kgpcpbqvqFn3O6e5bHrqc9FWfNVg+MIS0hwiUx6KAIA=; b=WaSnhpFJEzvN0WhslMIsO1Ww7kxqdrZDj/wuPZuSASINku6rISqF9xgA6QF0J+tuYYv7CUw/1x/798o073f5dGPlz/M56FFE0xYPnw/cFqmINdGVfIY25svtz/PaJhu9QWPDjD8TlspCQxaGnuq5QtAr9jZcmjcOehVBHzb50TI= 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+54771+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 1582623563938430.80260558427517; Tue, 25 Feb 2020 01:39:23 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id YQTFYY1788612x354tWoZ0U4; Tue, 25 Feb 2020 01:39:22 -0800 X-Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web10.1477.1582623562088988432 for ; Tue, 25 Feb 2020 01:39:22 -0800 X-Received: by mail-wr1-f65.google.com with SMTP id p18so10211110wre.9 for ; Tue, 25 Feb 2020 01:39:21 -0800 (PST) X-Gm-Message-State: GdloLN4g8DsOWtYJIiGnBfy2x1787277AA= X-Google-Smtp-Source: APXvYqy70+FPwsAiOyzdkwSVip5QeiuoP3l7nioE6H/VsEoiONCM9h4i/BoEee9tckmBDcAuRUBwjg== X-Received: by 2002:a05:6000:1251:: with SMTP id j17mr76033403wrx.210.1582623559933; Tue, 25 Feb 2020 01:39:19 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:19 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 2/6] OvmfPkg: add 'initrd' shell command to expose Linux initrd via device path Date: Tue, 25 Feb 2020 10:39:04 +0100 Message-Id: <20200225093908.6707-3-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623562; bh=J4ZSVpbEY1qQ51szHttTto+q7NlC6mcjsiC2eJ56X0U=; h=Cc:Date:From:Reply-To:Subject:To; b=lyhbLmmc4CjdFUwPo1f7cRAK8juFrEk+sMxLZwB6g++voA8zcRN+zu68HMcMlNC7deO e9caYrIsKLqjvmdC1/sCPjlqvgm9Cbnx+Q2B9umFkBK8UleEbOcX5a7rm23TYlEUDSBQE jkK1n/yMfmQQb4wAWErs6nTkhtTxXLjQ+K4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a new 'initrd' command to the UEFI Shell that allows any file that is accessible to the shell to be registered as the initrd that is returned when Linux's EFI stub loader invokes the LoadFile2 protocol on its special vendor media device path. Signed-off-by: Ard Biesheuvel --- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c = | 423 ++++++++++++++++++++ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf = | 52 +++ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.uni = | 49 +++ 3 files changed, 524 insertions(+) diff --git a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShell= Command.c b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellC= ommand.c new file mode 100644 index 000000000000..2e8541be07d5 --- /dev/null +++ b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .c @@ -0,0 +1,423 @@ +/** @file + Provides 'initrd' dynamic UEFI shell command to load a Linux initrd + via its GUIDed vendor media path + + Copyright (c) 2020, Arm, Ltd. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#pragma pack(1) +typedef struct { + VENDOR_DEVICE_PATH VenMediaNode; + EFI_DEVICE_PATH_PROTOCOL EndNode; +} SINGLE_NODE_VENDOR_MEDIA_DEVPATH; +#pragma pack() + +STATIC EFI_HII_HANDLE mLinuxInitrdShellCommandHiiHandle; +STATIC EFI_PHYSICAL_ADDRESS mInitrdFileAddress; +STATIC UINT64 mInitrdFileSize; +STATIC EFI_HANDLE mInitrdLoadFile2Handle; + +STATIC CONST SHELL_PARAM_ITEM ParamList[] =3D { + {L"-u", TypeFlag}, + {NULL, TypeMax} + }; + +STATIC CONST SINGLE_NODE_VENDOR_MEDIA_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) } + } +}; + +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 + ) +{ + 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 || + mInitrdFileSize =3D=3D 0) { + return EFI_NOT_FOUND; + } + + if (Buffer =3D=3D NULL || *BufferSize < mInitrdFileSize) { + *BufferSize =3D mInitrdFileSize; + return EFI_BUFFER_TOO_SMALL; + } + + ASSERT (mInitrdFileAddress !=3D 0); + + gBS->CopyMem (Buffer, (VOID *)(UINTN)mInitrdFileAddress, mInitrdFileSize= ); + *BufferSize =3D mInitrdFileSize; + return EFI_SUCCESS; +} + +STATIC CONST EFI_LOAD_FILE2_PROTOCOL mInitrdLoadFile2 =3D { + InitrdLoadFile2, +}; + +STATIC +EFI_STATUS +UninstallLoadFile2Protocol ( + VOID + ) +{ + EFI_STATUS Status; + + if (mInitrdLoadFile2Handle) { + Status =3D gBS->UninstallMultipleProtocolInterfaces (mInitrdLoadFile2H= andle, + &gEfiDevicePathProtocolGuid, &mInitrdDevicePath, + &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2, + NULL); + if (!EFI_ERROR (Status)) { + mInitrdLoadFile2Handle =3D NULL; + } + } + return Status; +} + +STATIC +VOID +FreeInitrdFile ( + VOID + ) +{ + if (mInitrdFileSize !=3D 0) { + gBS->FreePages (mInitrdFileAddress, EFI_SIZE_TO_PAGES (mInitrdFileSize= )); + mInitrdFileSize =3D 0; + } +} + +STATIC +EFI_STATUS +CacheInitrdFile ( + IN SHELL_FILE_HANDLE FileHandle + ) +{ + EFI_STATUS Status; + UINT64 FileSize; + UINTN ReadSize; + + Status =3D gEfiShellProtocol->GetFileSize (FileHandle, &FileSize); + if (EFI_ERROR(Status)) { + return Status; + } + + Status =3D gBS->AllocatePages (AllocateAnyPages, EfiLoaderData, + EFI_SIZE_TO_PAGES (FileSize), &mInitrdFileAddress); + if (EFI_ERROR(Status)) { + return Status; + } + + ReadSize =3D FileSize; + Status =3D gEfiShellProtocol->ReadFile (FileHandle, &ReadSize, + (VOID *)(UINTN)mInitrdFileAddress); + if (EFI_ERROR(Status) || ReadSize < FileSize) { + DEBUG ((DEBUG_WARN, "%a: failed to read initrd file - %r 0x%llx 0x%llx= \n", + __FUNCTION__, Status, (UINT64)ReadSize, FileSize)); + goto FreeMemory; + } + + if (mInitrdLoadFile2Handle =3D=3D NULL) { + Status =3D gBS->InstallMultipleProtocolInterfaces (&mInitrdLoadFile2Ha= ndle, + &gEfiDevicePathProtocolGuid, &mInitrdDevicePath, + &gEfiLoadFile2ProtocolGuid, &mInitrdLoadFile2, + NULL); + ASSERT_EFI_ERROR (Status); + } + + mInitrdFileSize =3D FileSize; + return EFI_SUCCESS; + +FreeMemory: + gBS->FreePages (mInitrdFileAddress, EFI_SIZE_TO_PAGES (FileSize)); + return Status; +} + +/** + Function for 'initrd' command. + + @param[in] ImageHandle Handle to the Image (NULL if Internal). + @param[in] SystemTable Pointer to the System Table (NULL if Internal). +**/ +STATIC +SHELL_STATUS +EFIAPI +RunInitrd ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + LIST_ENTRY *Package; + CHAR16 *ProblemParam; + CONST CHAR16 *Param; + CONST CHAR16 *Filename; + SHELL_STATUS ShellStatus; + SHELL_FILE_HANDLE FileHandle; + + ProblemParam =3D NULL; + ShellStatus =3D SHELL_SUCCESS; + + Status =3D ShellInitialize (); + ASSERT_EFI_ERROR (Status); + + // + // parse the command line + // + Status =3D ShellCommandLineParse (ParamList, &Package, &ProblemParam, TR= UE); + if (EFI_ERROR (Status)) { + if (Status =3D=3D EFI_VOLUME_CORRUPTED && ProblemParam !=3D NULL) { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), + mLinuxInitrdShellCommandHiiHandle, L"initrd", ProblemParam); + FreePool (ProblemParam); + ShellStatus =3D SHELL_INVALID_PARAMETER; + } else { + ASSERT(FALSE); + } + } else { + if (ShellCommandLineGetCount (Package) > 2) { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), + mLinuxInitrdShellCommandHiiHandle, L"initrd"); + ShellStatus =3D SHELL_INVALID_PARAMETER; + } else if (ShellCommandLineGetCount (Package) < 2) { + if (ShellCommandLineGetFlag(Package, L"-u")) { + FreeInitrdFile (); + UninstallLoadFile2Protocol (); + } else { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), + mLinuxInitrdShellCommandHiiHandle, L"initrd"); + ShellStatus =3D SHELL_INVALID_PARAMETER; + } + } else { + Param =3D ShellCommandLineGetRawValue (Package, 1); + ASSERT (Param !=3D NULL); + + Filename =3D ShellFindFilePath (Param); + if (Filename =3D=3D NULL) { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), + mLinuxInitrdShellCommandHiiHandle, L"initrd", Param); + ShellStatus =3D SHELL_NOT_FOUND; + } else { + FreeInitrdFile (); + + Status =3D ShellOpenFileByName (Filename, &FileHandle, + EFI_FILE_MODE_READ, 0); + if (!EFI_ERROR (Status)) { + Status =3D CacheInitrdFile (FileHandle); + } + if (EFI_ERROR (Status)) { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_F= AIL), + mLinuxInitrdShellCommandHiiHandle, L"initrd", Param); + ShellStatus =3D SHELL_NOT_FOUND; + } + ShellCloseFile (&FileHandle); + } + } + } + return ShellStatus; +} + + +/** + This is the shell command handler function pointer callback type. This + function handles the command when it is invoked in the shell. + + @param[in] This The instance of the + EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL. + @param[in] SystemTable The pointer to the system table. + @param[in] ShellParameters The parameters associated with the com= mand. + @param[in] Shell The instance of the shell protocol use= d in + the context of processing this command. + + @return EFI_SUCCESS the operation was successful + @return other the operation failed. +**/ +SHELL_STATUS +EFIAPI +LinuxInitrdCommandHandler ( + IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This, + IN EFI_SYSTEM_TABLE *SystemTable, + IN EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters, + IN EFI_SHELL_PROTOCOL *Shell + ) +{ + gEfiShellParametersProtocol =3D ShellParameters; + gEfiShellProtocol =3D Shell; + + return RunInitrd (gImageHandle, SystemTable); +} + +/** + This is the command help handler function pointer callback type. This + function is responsible for displaying help information for the associat= ed + command. + + @param[in] This The instance of the + EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL. + @param[in] Language The pointer to the language string to = use. + + @return string Pool allocated help string, must be fr= eed + by caller +**/ +STATIC +CHAR16 * +EFIAPI +LinuxInitrdGetHelp ( + IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This, + IN CONST CHAR8 *Language + ) +{ + return HiiGetString (mLinuxInitrdShellCommandHiiHandle, + STRING_TOKEN (STR_GET_HELP_INITRD), Language); +} + +STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL mLinuxInitrdDynamicCommand =3D { + L"initrd", + LinuxInitrdCommandHandler, + LinuxInitrdGetHelp +}; + +/** + Retrieve HII package list from ImageHandle and publish to HII database. + + @param ImageHandle The image handle of the process. + + @return HII handle. +**/ +STATIC +EFI_HII_HANDLE +InitializeHiiPackage ( + EFI_HANDLE ImageHandle + ) +{ + EFI_STATUS Status; + EFI_HII_PACKAGE_LIST_HEADER *PackageList; + EFI_HII_HANDLE HiiHandle; + + // + // Retrieve HII package list from ImageHandle + // + Status =3D gBS->OpenProtocol (ImageHandle, &gEfiHiiPackageListProtocolGu= id, + (VOID **)&PackageList, ImageHandle, NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL); + ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return NULL; + } + + // + // Publish HII package list to HII Database. + // + Status =3D gHiiDatabase->NewPackageList (gHiiDatabase, PackageList, NULL, + &HiiHandle); + ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return NULL; + } + return HiiHandle; +} + +/** + Entry point of Linux Initrd dynamic UEFI Shell command. + + Produce the DynamicCommand protocol to handle "initrd" command. + + @param ImageHandle The image handle of the process. + @param SystemTable The EFI System Table pointer. + + @retval EFI_SUCCESS Initrd command is executed successfully. + @retval EFI_ABORTED HII package was failed to initialize. + @retval others Other errors when executing Initrd command. +**/ +EFI_STATUS +EFIAPI +LinuxInitrdDynamicShellCommandEntryPoint ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + mLinuxInitrdShellCommandHiiHandle =3D InitializeHiiPackage (ImageHandle); + if (mLinuxInitrdShellCommandHiiHandle =3D=3D NULL) { + return EFI_ABORTED; + } + + Status =3D gBS->InstallProtocolInterface (&ImageHandle, + &gEfiShellDynamicCommandProtocolGuid, + EFI_NATIVE_INTERFACE, + &mLinuxInitrdDynamicCommand); + ASSERT_EFI_ERROR (Status); + return Status; +} + +/** + Unload the dynamic UEFI Shell command. + + @param ImageHandle The image handle of the process. + + @retval EFI_SUCCESS The image is unloaded. + @retval Others Failed to unload the image. +**/ +EFI_STATUS +EFIAPI +LinuxInitrdDynamicShellCommandUnload ( + IN EFI_HANDLE ImageHandle +) +{ + EFI_STATUS Status; + + Status =3D UninstallLoadFile2Protocol (); + if (EFI_ERROR (Status)) { + return Status; + } + + Status =3D gBS->UninstallProtocolInterface (ImageHandle, + &gEfiShellDynamicCommandProtocolGuid, + &mLinuxInitrdDynamicCommand); + if (EFI_ERROR (Status)) { + return Status; + } + + HiiRemovePackages (mLinuxInitrdShellCommandHiiHandle); + return EFI_SUCCESS; +} diff --git a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShell= Command.inf b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShel= lCommand.inf new file mode 100644 index 000000000000..cdfdddf77a4d --- /dev/null +++ b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf @@ -0,0 +1,52 @@ +## @file +# Provides 'initrd' dynamic UEFI shell command to load a Linux initrd +# via its GUIDed vendor media path +# +# Copyright (c) 2020, Arm, Ltd. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# +## + +[Defines] + INF_VERSION =3D 1.27 + BASE_NAME =3D LinuxInitrdDynamicShellCommand + FILE_GUID =3D 2f30da26-f51b-4b6f-85c4-31873c281bca + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D LinuxInitrdDynamicShellCommandEntryPo= int + UNLOAD_IMAGE =3D LinuxInitrdDynamicShellCommandUnload + UEFI_HII_RESOURCE_SECTION =3D TRUE + +# +# VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 EBC +# + +[Sources.common] + LinuxInitrdDynamicShellCommand.c + LinuxInitrdDynamicShellCommand.uni + +[Packages] + MdePkg/MdePkg.dec + ShellPkg/ShellPkg.dec + MdeModulePkg/MdeModulePkg.dec + OvmfPkg/OvmfPkg.dec + +[LibraryClasses] + DebugLib + DevicePathLib + HiiLib + MemoryAllocationLib + ShellLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiHiiServicesLib + +[Protocols] + gEfiHiiPackageListProtocolGuid ## CONSUMES + gEfiLoadFile2ProtocolGuid ## SOMETIMES_PRODUCES + gEfiShellDynamicCommandProtocolGuid ## PRODUCES + +[DEPEX] + TRUE diff --git a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShell= Command.uni b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShel= lCommand.uni new file mode 100644 index 000000000000..a88fa6e3641b --- /dev/null +++ b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .uni @@ -0,0 +1,49 @@ +// /** +// +// Copyright (c) 2020, Arm, Ltd. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause-Patent +// +// Module Name: +// +// LinuxInitrdDynamicShellCommand.uni +// +// Abstract: +// +// String definitions for 'initrd' UEFI Shell command +// +// **/ + +/=3D# + +#langdef en-US "english" + +#string STR_GEN_PROBLEM #language en-US "%H%s%N: Unknown flag - = '%H%s%N'\r\n" +#string STR_GEN_TOO_MANY #language en-US "%H%s%N: Too many argume= nts.\r\n" +#string STR_GEN_TOO_FEW #language en-US "%H%s%N: Too few argumen= ts.\r\n" +#string STR_GEN_FIND_FAIL #language en-US "%H%s%N: File not found = - '%H%s%N'\r\n" +#string STR_GEN_FILE_OPEN_FAIL #language en-US "%H%s%N: Cannot open fil= e - '%H%s%N'\r\n" + +#string STR_GET_HELP_INITRD #language en-US "" +".TH initrd 0 "Registers or unregisters a file as Linux initrd."\r\n" +".SH NAME\r\n" +"Registers or unregisters a file as Linux initrd.\r\n" +".SH SYNOPSIS\r\n" +" \r\n" +"initrd \r\n" +"initrd -u\r\n" +".SH OPTIONS\r\n" +" \r\n" +" FileName - Specifies a file to register as initrd.\r\n" +" -u - Unregisters any previously registered initrd files.\r\n" +".SH DESCRIPTION\r\n" +" \r\n" +"NOTES:\r\n" +" 1. Only a single file can be loaded as initrd at any given time. Using = the\r\n" +" command twice with a option will result in the first file= to\r\n" +" be unloaded again, regardless of whether the second invocation succe= eded\r\n" +" or not.\r\n" +" 2. The initrd is not unloaded when the shell exits, and will remain act= ive\r\n" +" until it is unloaded again by a different invocation of the shell.\r= \n" +" Consumers of the LoadFile2 protocol on the LINUX_EFI_INITRD_MEDIA_GU= ID\r\n" +" device path that are started via means other than the shell will be = able\r\n" +" to locate the protocol and invoke it.\r\n" --=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 (#54771): https://edk2.groups.io/g/devel/message/54771 Mute This Topic: https://groups.io/mt/71530296/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- From nobody Mon Apr 29 14:39:39 2024 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+54772+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+54772+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623564; cv=none; d=zohomail.com; s=zohoarc; b=kYySYxz2hDmsJgU1C4KNZS7B3OJXvHUwRJuznCL08Kz9iQk6sMKIMB8UP3ifZLoalpSw1BZRye3urjir60tEkO+t0SSeF0EeYTqbgYcJ1zQLUWaVWiKTjtw8r5vs0H0uQoukCH9tGrPoBLxPlMNMhS7Cnw5Ao6d2/1y+XFKK7cY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623564; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=bOneX0f1o/hjmSdkPhjG7Q7m71FHSUvI7YJRgVXwIUA=; b=JHJ+JI2yPkL7+kExDozed439y/FY9RiExKE3jtMdx5WbChcZuHI1KDp+6mze9fMR2zt5vPkG15DN3EUXuKZnOBmCS7BQylojWxKvEsg3vh4jLzBtnv2S6BgOptQcsFk4JSxM5r1CsRndeleN8/FWBIaNinAhxFDBGrIpQQ0dgAI= 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+54772+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 1582623564564960.1744698243565; Tue, 25 Feb 2020 01:39:24 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QEqfYY1788612x4y6ST9CM99; Tue, 25 Feb 2020 01:39:23 -0800 X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web10.1478.1582623562786053407 for ; Tue, 25 Feb 2020 01:39:23 -0800 X-Received: by mail-wr1-f66.google.com with SMTP id v4so992193wrs.8 for ; Tue, 25 Feb 2020 01:39:22 -0800 (PST) X-Gm-Message-State: Pr6XDdWekxqhw92DVdlHFG3kx1787277AA= X-Google-Smtp-Source: APXvYqxHrwRnMwr3CYLC2hmr+fJyeQL6WRe1r6XZmDREcOTfieacOJ9TYcZme5jzO44GQFkaaFezvw== X-Received: by 2002:adf:fc85:: with SMTP id g5mr16015957wrr.52.1582623561148; Tue, 25 Feb 2020 01:39:21 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:20 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 3/6] ArmVirtPkg: add the 'initrd' dynamic shell command Date: Tue, 25 Feb 2020 10:39:05 +0100 Message-Id: <20200225093908.6707-4-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623563; bh=jl9irOQCeR3vAYr1NAdFnyjkWNGmvBqpYOM6+xp513E=; h=Cc:Date:From:Reply-To:Subject:To; b=TscUmBPBax+x42f+ct0MAzBFbYkq71nhaj4KKUFkDo+8j9H07ww9LkwIQ6Ce/sEq1el 8D7zSnoSEPKKb3SyVlYE5p/4ipLiMIcq/ujXYYtK2eAoloyZknNAz/JAbmm/ROtCUBZ3V I5cZk7U02ec9y2hQtJazzr0c44Za/22gsgA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the 'initrd' dynamic shell command to the build so we can load Linux initrds straight from the shell using the new generic protocol, which does not rely on initrd=3D being passed on the command line. Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirt.dsc.inc | 4 ++++ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + ArmVirtPkg/ArmVirtXen.fdf | 1 + 3 files changed, 6 insertions(+) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 10037c938eb8..608dfe1aa03d 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -401,6 +401,10 @@ [Components.common] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } =20 [Components.AARCH64] # diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index 31f615a9d0f9..bfa380815f1a 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -103,6 +103,7 @@ [FV.FvMain] # INF ShellPkg/Application/Shell/Shell.inf INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComman= d.inf =20 # # Bds diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index 38d4cc163524..6a97bceeacbc 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -182,6 +182,7 @@ [FV.FvMain] # INF ShellPkg/Application/Shell/Shell.inf INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComman= d.inf =20 # # Bds --=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 (#54772): https://edk2.groups.io/g/devel/message/54772 Mute This Topic: https://groups.io/mt/71530297/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- From nobody Mon Apr 29 14:39:39 2024 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+54773+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+54773+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623565; cv=none; d=zohomail.com; s=zohoarc; b=HJhP4dK3TRkLQc+Z64X19/yGJrFS0JsS4MhaZ6f6YXMW2w9EG2OqLzqlGhaDURTaWgYeggqy9NcjdmIf8o3TTU0m1tz0KAKF6CjDmfRGEYM5hgVRXi2awJvQ/LnFAFeWHRpSyW6n5IxkMvgArARS3i+u3tAhCR9uz9Kt6zD3Vl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623565; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=3RiflGEAUPXRgOfeCPMK6iwSdsn8PE29ES06tkk1dqM=; b=AWoH8YGAHNnyXlMPHpdPtktnEc0C+pGeLYU1iP1fjpPMfxHfgWXyxE1fMcz9ehBZDZU4TGvkc9dDFWjo0/G/fVTv6N0vD2/CmtuSK/gmT1+9PSmFobZhGVnjDHbtEpleViqEBaP0xKNuUvts1LxgJYKSU9lCGnGNHz6R7vzkjWU= 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+54773+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 158262356570657.14638206607469; Tue, 25 Feb 2020 01:39:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8aXPYY1788612xRR6IVXScsC; Tue, 25 Feb 2020 01:39:24 -0800 X-Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web11.1476.1582623564130796289 for ; Tue, 25 Feb 2020 01:39:24 -0800 X-Received: by mail-wr1-f67.google.com with SMTP id l5so9615212wrx.4 for ; Tue, 25 Feb 2020 01:39:23 -0800 (PST) X-Gm-Message-State: ndYgQPkho3woz0FQTTLsNrTtx1787277AA= X-Google-Smtp-Source: APXvYqwDSrAn0Ny6wI0r4n9yc0v8BBhP8kvK56uAd74w2NzTTjeLLmcJ69HNtfAvkwfpnPXcH3Beeg== X-Received: by 2002:adf:d4c7:: with SMTP id w7mr74168670wrk.101.1582623562451; Tue, 25 Feb 2020 01:39:22 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:21 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 4/6] OvmfPkg: add the 'initrd' dynamic shell command Date: Tue, 25 Feb 2020 10:39:06 +0100 Message-Id: <20200225093908.6707-5-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623564; bh=Y9ILu2ZWyFPfEsl5c7yPr/RiwHj4PJp1kI6nF7hG95A=; h=Cc:Date:From:Reply-To:Subject:To; b=NnjSSnpkyoRV011OjytfviJSIbanBh+90WxOTZ+D5gylbyivrb64tWhd2wBLgns9JEH weRYuPGP0R+HyQMz70JsRWfIrd1pxXx1XdBmJY84kvN9o8sbFQYDPJDxvV6AKGQ1JRBB9 s3IOPrgmK6ENE8+ShRNwrH3FqVXpqcKBf5s= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the 'initrd' dynamic shell command to the build so we can load Linux initrds straight from the shell using the new generic protocol, which does not rely on initrd=3D being passed on the command line. Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32.fdf | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32X64.fdf | 1 + OvmfPkg/OvmfPkgX64.dsc | 4 ++++ OvmfPkg/OvmfPkgX64.fdf | 1 + OvmfPkg/OvmfXen.dsc | 4 ++++ OvmfPkg/OvmfXen.fdf | 1 + 8 files changed, 20 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 19728f20b34e..870eb7aa7429 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -843,6 +843,10 @@ [Components] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 63607551ed75..b6cd5da4f2b3 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -282,6 +282,7 @@ [FV.DXEFV] INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf +INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf =20 INF MdeModulePkg/Logo/LogoDxe.inf =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 3c0c229e3a72..8022365e664c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -856,6 +856,10 @@ [Components.X64] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 0488e5d95ffe..159840836775 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -283,6 +283,7 @@ [FV.DXEFV] INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf +INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf =20 INF MdeModulePkg/Logo/LogoDxe.inf =20 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f6c1d8d228c6..90c0bd16e6a0 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -854,6 +854,10 @@ [Components] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 0488e5d95ffe..159840836775 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -283,6 +283,7 @@ [FV.DXEFV] INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf +INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf =20 INF MdeModulePkg/Logo/LogoDxe.inf =20 diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 5751ff1f0352..6612018ad6a8 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -714,6 +714,10 @@ [Components] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } =20 OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/AmdSevDxe/AmdSevDxe.inf diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 05138ffc5b4f..cfdb01a80a00 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -365,6 +365,7 @@ [FV.DXEFV] INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf +INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf =20 INF MdeModulePkg/Logo/LogoDxe.inf =20 --=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 (#54773): https://edk2.groups.io/g/devel/message/54773 Mute This Topic: https://groups.io/mt/71530298/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- From nobody Mon Apr 29 14:39:39 2024 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+54774+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+54774+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623567; cv=none; d=zohomail.com; s=zohoarc; b=EJcypWYFOPKQJSpslpPSatHK+ZHFeIctOamDr6o2VEz0noRgXNcjRFcHSdaynm9ZILFRIlvP6DtAt02BMK3us2VYHCBLzVSK05Uw00flJDIOWT6ajiuAHUNOGGbHpbMMcEdT95PAdJVJYZQNN7B9pLPXjgCeqUdNGpftdrEO1As= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623567; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Am/YyfPRtfOzXPmrysyGUnJeg7VaIanf3NNqLZa0Zd4=; b=jpkebJ4hrQIK7xkGIwAyv9ipYJK6bvUztcZoVoO+PvEyDUKuHFW0CYVGDlsKTd7+gxHa7QGr66EmyPXGCu+3R9+ybH75TrZGTpv2rNnAUKX2N4Wfv0DQnREiJVgjT+cZnEiO6Kc45dTHiRvATiQJ8NXxtQMYrnThPCT1BrKK9v8= 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+54774+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 1582623567348724.7450959962315; Tue, 25 Feb 2020 01:39:27 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id sPfwYY1788612xAk7ZUlaCc3; Tue, 25 Feb 2020 01:39:26 -0800 X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web09.1470.1582623565664241991 for ; Tue, 25 Feb 2020 01:39:25 -0800 X-Received: by mail-wr1-f66.google.com with SMTP id j7so1332819wrp.13 for ; Tue, 25 Feb 2020 01:39:25 -0800 (PST) X-Gm-Message-State: e215RYn56qZE9jI2Pwd7TBS9x1787277AA= X-Google-Smtp-Source: APXvYqzqRKkOjd6MnygyYzSFG0l7ivt6y4cPl1ADb/hVsewc5bnw4VA2dl4a/ePB1dVuf3mTY8zq9w== X-Received: by 2002:adf:e3cd:: with SMTP id k13mr48029288wrm.302.1582623563871; Tue, 25 Feb 2020 01:39:23 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:23 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 5/6] MdeModulePkg/DxeCore: defer PE/COFF emulator registration to StartImage Date: Tue, 25 Feb 2020 10:39:07 +0100 Message-Id: <20200225093908.6707-6-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623566; bh=IS6RayW9sDU6wNxnywETMGe5oTUgO1AmuGgy05k+34Q=; h=Cc:Date:From:Reply-To:Subject:To; b=hTdvywcPJss/0hmWAdNBTYMDgx1EJ30bzBsVd6DDO4Y7uWnLerwBfa7idkii94wBeiA FvRYWDfR54viFxlrp4jWSDBlh1MyP9LA1gOk5Rook98hNmC7R9TWaVsE6aNMoGG7idonS MVZWiB7SgGuX8SI1XpXgPabPIZN17rfYwms= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" EDK2's implementation of the LoadImage() boot service permits non-native binaries to be loaded (i.e., X64 images on IA32 firmware), but any attempts to start such an image using StartImage() will return EFI_UNSUPPORTED. The integration of the PE/COFF emulator protocol into the DXE core deviates slightly from this paradigm, given that its IsImageSupported hook as well as its RegisterImage hook are invoked from LoadImage, and by the time StartImage is called, no opportunity is given to the provider of the PE/COFF emulator protocol to prevent an image from being started if it only supports loading it. To address this disparity, let's move the invocation of RegisterImage() to the implementation of the StartImage() boot service, allowing the emulator to permit LoadImage() but reject StartImage() on images that turn out not to meet the requirements of the emulator as it is being started. Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Core/Dxe/Image/Image.c | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Im= age/Image.c index 22a87ecf6d7c..d86da89ee704 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -756,17 +756,6 @@ CoreLoadPeImage ( // Get the image entry point. // Image->EntryPoint =3D (EFI_IMAGE_ENTRY_POINT)(UINTN)Image->ImageContex= t.EntryPoint; - if (Image->PeCoffEmu !=3D NULL) { - Status =3D Image->PeCoffEmu->RegisterImage (Image->PeCoffEmu, - Image->ImageBasePage, - EFI_PAGES_TO_SIZE (Image->NumberOfPages), - &Image->EntryPoint); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_LOAD | DEBUG_ERROR, - "CoreLoadPeImage: Failed to register foreign image with emulator.\= n")); - goto Done; - } - } =20 // // Fill in the image information for the Loaded Image Protocol @@ -1603,6 +1592,19 @@ CoreStartImage ( return EFI_UNSUPPORTED; } =20 + if (Image->PeCoffEmu !=3D NULL) { + Status =3D Image->PeCoffEmu->RegisterImage (Image->PeCoffEmu, + Image->ImageBasePage, + EFI_PAGES_TO_SIZE (Image->NumberOfPages), + &Image->EntryPoint); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_LOAD | DEBUG_ERROR, + "CoreLoadPeImage: Failed to register foreign image with emulator -= %r\n", + Status)); + return Status; + } + } + PERF_START_IMAGE_BEGIN (Handle); =20 =20 --=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 (#54774): https://edk2.groups.io/g/devel/message/54774 Mute This Topic: https://groups.io/mt/71530299/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- From nobody Mon Apr 29 14:39:39 2024 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+54775+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+54775+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582623569; cv=none; d=zohomail.com; s=zohoarc; b=mPwkWGWp1g9J7K5Oa6tCvKmWcsgHd8e+N4HCaEhAOquLN84LWpLObAX/0P3Xh1OugSKtfZTHR2gwaRWIpHoBWbvzVOp/WeaaJ910U5yMbVtoNFRAhthQvKNK5GX3oOkQr//3j1bkTnuDcnUMCjfyvrdAbOWDea3wACxpVxhpjVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582623569; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=XfWj9wmNSgjYsl/RI8cHh3mATCfRGAB3wQx9Bc7i7DA=; b=l/l1Q3km3vYeE7J225hu36iZ/4kXZESMl3r/IjMtZcm283hfRZSLOEZrSqgkQ2bWMsQyOu+mNm/SbHagcnMcyFAQLa8wkIS5X5JWfJBj535rNycTy3AjQyFfhTU8yIwmUDgK7Tycr2I/MpZEDQ1qUirvj6IFUex5zy7pt6daUE4= 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+54775+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 1582623569165563.4407715940464; Tue, 25 Feb 2020 01:39:29 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id yYubYY1788612x4vjIou2QzQ; Tue, 25 Feb 2020 01:39:28 -0800 X-Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.groups.io with SMTP id smtpd.web11.1478.1582623567495254183 for ; Tue, 25 Feb 2020 01:39:27 -0800 X-Received: by mail-wm1-f68.google.com with SMTP id c84so2373221wme.4 for ; Tue, 25 Feb 2020 01:39:27 -0800 (PST) X-Gm-Message-State: gD1wgploBmv1L94LZuG8TTwcx1787277AA= X-Google-Smtp-Source: APXvYqxyJvaldx3XPlVeo7D0d2Pc2pURc+mgtajBb5V6m0diUU4cG4U05RZ47eNkFFL5mwtKvDlAGg== X-Received: by 2002:a1c:4383:: with SMTP id q125mr4275793wma.88.1582623565271; Tue, 25 Feb 2020 01:39:25 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id y12sm23353079wrw.88.2020.02.25.01.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 01:39:24 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com Subject: [edk2-devel] [PATCH v2 6/6] OvmfPkg IA32: add support for loading X64 images Date: Tue, 25 Feb 2020 10:39:08 +0100 Message-Id: <20200225093908.6707-7-ard.biesheuvel@linaro.org> In-Reply-To: <20200225093908.6707-1-ard.biesheuvel@linaro.org> References: <20200225093908.6707-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=1582623568; bh=NUW1ngbXZUHDNKS9q8dJzJGUgIEc+YxR4Dxf1Q0HF1A=; h=Cc:Date:From:Reply-To:Subject:To; b=pTrILlsoFJ42r3WFFtp1vVBUFAZqFKKN8QmVf/LpEfav05ipMaSKEbj9I7fvJo5TE9j hyT3pWyAhLcpd4k3+vgN1Bh+vVp9Y0M0tEWR5X8eIqX+q4saaAtJcao+XIlS6WhcsmXsp GYMQsmEUvoUvsjnLOjyCmKmHQWY+WezZscI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is the UEFI counterpart to my Linux series which generalizes mixed mode support into a feature that requires very little internal knowledge about the architecture specifics of booting Linux on the part of the bootloader or firmware. Instead, we add a .compat PE/COFF header containing an array of PE_COMPAT nodes containing tuples that describe alternate entrypoints into the image for different native machine types, e.g., IA-32 in a 64-bit image so it can be booted from IA-32 firmware. This patch implements the PE/COFF emulator protocol to take this new section into account, so that such images can simply be loaded via LoadImage/StartImage, e.g., straight from the shell. This feature is based on the EDK2 specific PE/COFF emulator protocol that was introduced in commit 57df17fe26cd ("MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images", 2019-04-14). Signed-off-by: Ard Biesheuvel Acked-by: Laszlo Ersek --- OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.c | 140 ++++++++++++++= ++++++ OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf | 36 +++++ OvmfPkg/OvmfPkgIa32.dsc | 5 + OvmfPkg/OvmfPkgIa32.fdf | 4 + 4 files changed, 185 insertions(+) diff --git a/OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.c b/OvmfPkg/= CompatImageLoaderDxe/CompatImageLoaderDxe.c new file mode 100644 index 000000000000..d2ae03eabf7f --- /dev/null +++ b/OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.c @@ -0,0 +1,140 @@ +/** @file + * PE/COFF emulator protocol implementation to start Linux kernel + * images from non-native firmware + * + * Copyright (c) 2020, ARM Ltd. All rights reserved.
+ * + * SPDX-License-Identifier: BSD-2-Clause-Patent + * + */ + +#include + +#include +#include +#include +#include + +#include + +#pragma pack(1) +typedef struct { + UINT8 Type; + UINT8 Size; + UINT16 MachineType; + UINT32 EntryPoint; +} PE_COMPAT_TYPE1; +#pragma pack() + +STATIC +BOOLEAN +EFIAPI +IsImageSupported ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN UINT16 ImageType, + IN EFI_DEVICE_PATH_PROTOCOL *DevicePath OPTIONAL + ) +{ + return ImageType =3D=3D EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION; +} + +STATIC +EFI_IMAGE_ENTRY_POINT +EFIAPI +GetCompatEntryPoint ( + IN EFI_PHYSICAL_ADDRESS ImageBase + ) +{ + EFI_IMAGE_DOS_HEADER *DosHdr; + UINTN PeCoffHeaderOffset; + EFI_IMAGE_NT_HEADERS32 *Pe32; + EFI_IMAGE_SECTION_HEADER *Section; + UINTN NumberOfSections; + PE_COMPAT_TYPE1 *PeCompat; + + DosHdr =3D (EFI_IMAGE_DOS_HEADER *)(UINTN)ImageBase; + if (DosHdr->e_magic !=3D EFI_IMAGE_DOS_SIGNATURE) { + return NULL; + } + + PeCoffHeaderOffset =3D DosHdr->e_lfanew; + Pe32 =3D (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageBase + PeCoffHeaderOffse= t); + + Section =3D (EFI_IMAGE_SECTION_HEADER *)((UINTN)&Pe32->OptionalHeader + + Pe32->FileHeader.SizeOfOptionalHe= ader); + NumberOfSections =3D (UINTN)Pe32->FileHeader.NumberOfSections; + + while (NumberOfSections--) { + if (!CompareMem (Section->Name, ".compat", sizeof (Section->Name))) { + // + // Dereference the section contents to find the mixed mode entry poi= nt + // + PeCompat =3D (PE_COMPAT_TYPE1 *)((UINTN)ImageBase + Section->Virtual= Address); + + while (PeCompat->Type !=3D 0) { + if (PeCompat->Type =3D=3D 1 && + PeCompat->Size >=3D sizeof (PE_COMPAT_TYPE1) && + EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCompat->MachineType)) { + + return (EFI_IMAGE_ENTRY_POINT)((UINTN)ImageBase + PeCompat->Entr= yPoint); + } + PeCompat =3D (PE_COMPAT_TYPE1 *)((UINTN)PeCompat + PeCompat->Size); + } + } + Section++; + } + return NULL; +} + +STATIC +EFI_STATUS +EFIAPI +RegisterImage ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN EFI_PHYSICAL_ADDRESS ImageBase, + IN UINT64 ImageSize, + IN OUT EFI_IMAGE_ENTRY_POINT *EntryPoint + ) +{ + EFI_IMAGE_ENTRY_POINT CompatEntryPoint; + + CompatEntryPoint =3D GetCompatEntryPoint (ImageBase); + if (CompatEntryPoint =3D=3D NULL) { + return EFI_UNSUPPORTED; + } + + *EntryPoint =3D CompatEntryPoint; + return EFI_SUCCESS; +} + +STATIC +EFI_STATUS +EFIAPI +UnregisterImage ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN EFI_PHYSICAL_ADDRESS ImageBase + ) +{ + return EFI_SUCCESS; +} + +STATIC EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL mCompatLoaderPeCoffEmuProtocol= =3D { + IsImageSupported, + RegisterImage, + UnregisterImage, + EDKII_PECOFF_IMAGE_EMULATOR_VERSION, + EFI_IMAGE_MACHINE_X64 +}; + +EFI_STATUS +EFIAPI +CompatImageLoaderDxeEntryPoint ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + return gBS->InstallProtocolInterface (&ImageHandle, + &gEdkiiPeCoffImageEmulatorProtocolGuid, + EFI_NATIVE_INTERFACE, + &mCompatLoaderPeCoffEmuProtocol); +} diff --git a/OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf b/OvmfPk= g/CompatImageLoaderDxe/CompatImageLoaderDxe.inf new file mode 100644 index 000000000000..82369384fbe6 --- /dev/null +++ b/OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf @@ -0,0 +1,36 @@ +## @file +# PE/COFF emulator protocol implementation to start Linux kernel +# images from non-native firmware +# +# Copyright (c) 2020, ARM Ltd. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 1.27 + BASE_NAME =3D CompatImageLoaderDxe + FILE_GUID =3D 1019f54a-2560-41b2-87b0-6750b98f3eff + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D CompatImageLoaderDxeEntryPoint + +[Sources] + CompatImageLoaderDxe.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + +[LibraryClasses] + BaseMemoryLib + PeCoffLib + UefiBootServicesTableLib + UefiDriverEntryPoint + +[Protocols] + gEdkiiPeCoffImageEmulatorProtocolGuid ## PRODUCES + +[Depex] + TRUE diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 870eb7aa7429..a996c0a7a7c9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -33,6 +33,7 @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE =3D FALSE DEFINE TPM2_ENABLE =3D FALSE DEFINE TPM2_CONFIG_ENABLE =3D FALSE + DEFINE LOAD_X64_ON_IA32_ENABLE =3D FALSE =20 # # Network definition @@ -932,3 +933,7 @@ [Components] SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf !endif !endif + +!if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE + OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf +!endif diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index b6cd5da4f2b3..ff8d80859fb9 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -354,6 +354,10 @@ [FV.DXEFV] !endif !endif =20 +!if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE +INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf +!endif + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=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 (#54775): https://edk2.groups.io/g/devel/message/54775 Mute This Topic: https://groups.io/mt/71530301/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-