From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mx.groups.io with SMTP id smtpd.web10.9548.1624877477488596499 for ; Mon, 28 Jun 2021 03:51:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=BHsue3zP; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: dovmurik@linux.ibm.com) Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15SAdnWH149091; Mon, 28 Jun 2021 06:51:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pp1; bh=mQjICUcG8/va7A2D94kgrr/UExfH77X6nfHHFnTDJj4=; b=BHsue3zPYfqv67kpHE3Cl2jsIpKlI+tmFRFQpEXji6SMcCrJ7pXajFP1nMK56uxxCHIU 4Iv91rScKCh6taLp1OiB6mufu8oOZteu/XR7oPevqZV/0e2QVWifK2EsjKv8mEJHyAQy RS72C/vR2u+FWilgUsuffbu7REBmtOvEt++PnkummSVCJ0BoOg+z0QPzVMwPZNr5pkVH GuworsQg+1ftjL3inPwPkwCsYcRGoMJg8UGqpRdIYXSK7U2Ke/3pf6LzOLFj8j/5tUq2 8JAtIfN8OhcYwoUP1No1pRTgbv/F+TSs3i1+19nPhuXY6axMfO22pixkkZs4wMGE0hAR 7Q== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 39faxrkmu1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Jun 2021 06:51:17 -0400 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 15SAe9Gk149730; Mon, 28 Jun 2021 06:51:16 -0400 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0a-001b2d01.pphosted.com with ESMTP id 39faxrkmth-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Jun 2021 06:51:16 -0400 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15SAgMGN031010; Mon, 28 Jun 2021 10:51:15 GMT Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by ppma01wdc.us.ibm.com with ESMTP id 39ejywjv8r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Jun 2021 10:51:15 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15SApExF6947418 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Jun 2021 10:51:15 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF59AAC065; Mon, 28 Jun 2021 10:51:14 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AEFCFAC060; Mon, 28 Jun 2021 10:51:14 +0000 (GMT) Received: from localhost.localdomain (unknown [9.2.130.16]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 28 Jun 2021 10:51:14 +0000 (GMT) From: "Dov Murik" To: devel@edk2.groups.io Cc: Dov Murik , Laszlo Ersek , Ard Biesheuvel , Jordan Justen , James Bottomley , Tobin Feldman-Fitzthum Subject: [PATCH v3 4/5] OvmfPkg/GenericQemuLoadImageLib: Read cmdline from QemuKernelLoaderFs Date: Mon, 28 Jun 2021 10:51:09 +0000 Message-Id: <20210628105110.379951-5-dovmurik@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210628105110.379951-1-dovmurik@linux.ibm.com> References: <20210628105110.379951-1-dovmurik@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: LQkm_30mKhvJ3QClw6-jXn2yZRjpRfoS X-Proofpoint-GUID: MCahGCFU_EAWVpiSorUqcDoZsoQRQkus X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-06-28_09:2021-06-25,2021-06-28 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501 mlxlogscore=999 adultscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106280074 Content-Transfer-Encoding: quoted-printable Remove the QemuFwCfgLib interface used to read the QEMU cmdline (-append argument) and the initrd size. Instead, use the synthetic filesystem QemuKernelLoaderFs which has three files: "kernel", "initrd", and "cmdline". Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Cc: James Bottomley Cc: Tobin Feldman-Fitzthum Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3457 Signed-off-by: Dov Murik --- OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf | 3 = +- OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c | 151 = ++++++++++++++++++-- 2 files changed, 139 insertions(+), 15 deletions(-) diff --git a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLi= b.inf b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf index b262cb926a4d..9c9e35b1c5b9 100644 --- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf +++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf @@ -25,14 +25,15 @@ [Packages] =0D [LibraryClasses]=0D DebugLib=0D + FileHandleLib=0D MemoryAllocationLib=0D PrintLib=0D - QemuFwCfgLib=0D UefiBootServicesTableLib=0D =0D [Protocols]=0D gEfiDevicePathProtocolGuid=0D gEfiLoadedImageProtocolGuid=0D + gEfiSimpleFileSystemProtocolGuid=0D =0D [Guids]=0D gQemuKernelLoaderFsMediaGuid=0D diff --git a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLi= b.c b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c index 8a29976ae172..66e029397bd6 100644 --- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c +++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c @@ -11,13 +11,14 @@ #include =0D #include =0D #include =0D +#include =0D #include =0D #include =0D -#include =0D #include =0D #include =0D #include =0D #include =0D +#include =0D =0D #pragma pack (1)=0D typedef struct {=0D @@ -30,6 +31,11 @@ typedef struct { KERNEL_FILE_DEVPATH FileNode;=0D EFI_DEVICE_PATH_PROTOCOL EndNode;=0D } KERNEL_VENMEDIA_FILE_DEVPATH;=0D +=0D +typedef struct {=0D + VENDOR_DEVICE_PATH VenMediaNode;=0D + EFI_DEVICE_PATH_PROTOCOL EndNode;=0D +} SINGLE_VENMEDIA_NODE_DEVPATH;=0D #pragma pack ()=0D =0D STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDevicePath =3D {=0D @@ -51,6 +57,82 @@ STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDeviceP= ath =3D { }=0D };=0D =0D +STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mQemuKernelLoaderFsDevicePath = =3D {=0D + {=0D + {=0D + MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,=0D + { sizeof (VENDOR_DEVICE_PATH) }=0D + },=0D + QEMU_KERNEL_LOADER_FS_MEDIA_GUID=0D + }, {=0D + END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,=0D + { sizeof (EFI_DEVICE_PATH_PROTOCOL) }=0D + }=0D +};=0D +=0D +STATIC=0D +EFI_STATUS=0D +GetQemuKernelLoaderBlobSize (=0D + IN EFI_FILE_HANDLE Root,=0D + IN CHAR16 *FileName,=0D + OUT UINTN *Size=0D + )=0D +{=0D + EFI_STATUS Status;=0D + EFI_FILE_HANDLE FileHandle;=0D + UINT64 FileSize;=0D +=0D + Status =3D Root->Open (Root, &FileHandle, FileName, EFI_FILE_MODE_READ, = 0);=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D + Status =3D FileHandleGetSize (FileHandle, &FileSize);=0D + if (EFI_ERROR (Status)) {=0D + goto CloseFile;=0D + }=0D + if (FileSize > MAX_UINTN) {=0D + Status =3D EFI_UNSUPPORTED;=0D + goto CloseFile;=0D + }=0D + *Size =3D (UINTN)FileSize;=0D + Status =3D EFI_SUCCESS;=0D +CloseFile:=0D + FileHandle->Close (FileHandle);=0D + return Status;=0D +}=0D +=0D +STATIC=0D +EFI_STATUS=0D +ReadWholeQemuKernelLoaderBlob (=0D + IN EFI_FILE_HANDLE Root,=0D + IN CHAR16 *FileName,=0D + IN UINTN Size,=0D + OUT VOID *Buffer=0D + )=0D +{=0D + EFI_STATUS Status;=0D + EFI_FILE_HANDLE FileHandle;=0D + UINTN ReadSize;=0D +=0D + Status =3D Root->Open (Root, &FileHandle, FileName, EFI_FILE_MODE_READ, = 0);=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D + ReadSize =3D Size;=0D + Status =3D FileHandle->Read (FileHandle, &ReadSize, Buffer);=0D + if (EFI_ERROR (Status)) {=0D + goto CloseFile;=0D + }=0D + if (ReadSize !=3D Size) {=0D + Status =3D EFI_PROTOCOL_ERROR;=0D + goto CloseFile;=0D + }=0D + Status =3D EFI_SUCCESS;=0D +CloseFile:=0D + FileHandle->Close (FileHandle);=0D + return Status;=0D +}=0D +=0D /**=0D Download the kernel, the initial ramdisk, and the kernel command line fr= om=0D QEMU's fw_cfg. The kernel will be instructed via its command line to loa= d=0D @@ -76,12 +158,16 @@ QemuLoadKernelImage ( OUT EFI_HANDLE *ImageHandle=0D )=0D {=0D - EFI_STATUS Status;=0D - EFI_HANDLE KernelImageHandle;=0D - EFI_LOADED_IMAGE_PROTOCOL *KernelLoadedImage;=0D - UINTN CommandLineSize;=0D - CHAR8 *CommandLine;=0D - UINTN InitrdSize;=0D + EFI_STATUS Status;=0D + EFI_HANDLE KernelImageHandle;=0D + EFI_LOADED_IMAGE_PROTOCOL *KernelLoadedImage;=0D + EFI_DEVICE_PATH_PROTOCOL *DevicePathNode;=0D + EFI_HANDLE FsVolumeHandle;=0D + EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FsProtocol;=0D + EFI_FILE_HANDLE Root;=0D + UINTN CommandLineSize;=0D + CHAR8 *CommandLine;=0D + UINTN InitrdSize;=0D =0D //=0D // Load the image. This should call back into the QEMU EFI loader file s= ystem.=0D @@ -124,8 +210,38 @@ QemuLoadKernelImage ( );=0D ASSERT_EFI_ERROR (Status);=0D =0D - QemuFwCfgSelectItem (QemuFwCfgItemCommandLineSize);=0D - CommandLineSize =3D (UINTN)QemuFwCfgRead32 ();=0D + //=0D + // Open the Qemu Kernel Loader abstract filesystem (volume) which will b= e=0D + // used to query the "initrd" and to read the "cmdline" synthetic files.= =0D + //=0D + DevicePathNode =3D (EFI_DEVICE_PATH_PROTOCOL *)&mQemuKernelLoaderFsDevic= ePath;=0D + Status =3D gBS->LocateDevicePath (=0D + &gEfiSimpleFileSystemProtocolGuid,=0D + &DevicePathNode,=0D + &FsVolumeHandle=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto UnloadImage;=0D + }=0D +=0D + Status =3D gBS->HandleProtocol (=0D + FsVolumeHandle,=0D + &gEfiSimpleFileSystemProtocolGuid,=0D + (VOID **)&FsProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto UnloadImage;=0D + }=0D +=0D + Status =3D FsProtocol->OpenVolume (FsVolumeHandle, &Root);=0D + if (EFI_ERROR (Status)) {=0D + goto UnloadImage;=0D + }=0D +=0D + Status =3D GetQemuKernelLoaderBlobSize (Root, L"cmdline", &CommandLineSi= ze);=0D + if (EFI_ERROR (Status)) {=0D + goto CloseRoot;=0D + }=0D =0D if (CommandLineSize =3D=3D 0) {=0D KernelLoadedImage->LoadOptionsSize =3D 0;=0D @@ -133,11 +249,14 @@ QemuLoadKernelImage ( CommandLine =3D AllocatePool (CommandLineSize);=0D if (CommandLine =3D=3D NULL) {=0D Status =3D EFI_OUT_OF_RESOURCES;=0D - goto UnloadImage;=0D + goto CloseRoot;=0D }=0D =0D - QemuFwCfgSelectItem (QemuFwCfgItemCommandLineData);=0D - QemuFwCfgReadBytes (CommandLineSize, CommandLine);=0D + Status =3D ReadWholeQemuKernelLoaderBlob (Root, L"cmdline", CommandLin= eSize,=0D + CommandLine);=0D + if (EFI_ERROR (Status)) {=0D + goto FreeCommandLine;=0D + }=0D =0D //=0D // Verify NUL-termination of the command line.=0D @@ -155,8 +274,10 @@ QemuLoadKernelImage ( KernelLoadedImage->LoadOptionsSize =3D (UINT32)((CommandLineSize - 1) = * 2);=0D }=0D =0D - QemuFwCfgSelectItem (QemuFwCfgItemInitrdSize);=0D - InitrdSize =3D (UINTN)QemuFwCfgRead32 ();=0D + Status =3D GetQemuKernelLoaderBlobSize (Root, L"initrd", &InitrdSize);=0D + if (EFI_ERROR (Status)) {=0D + goto FreeCommandLine;=0D + }=0D =0D if (InitrdSize > 0) {=0D //=0D @@ -199,6 +320,8 @@ FreeCommandLine: if (CommandLineSize > 0) {=0D FreePool (CommandLine);=0D }=0D +CloseRoot:=0D + Root->Close (Root);=0D UnloadImage:=0D if (EFI_ERROR (Status)) {=0D gBS->UnloadImage (KernelImageHandle);=0D --=20 2.25.1