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.web12.5240.1623921181763600485 for ; Thu, 17 Jun 2021 02:13:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=Ssgyb+yQ; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: dovmurik@linux.ibm.com) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15H93HFw083744 for ; Thu, 17 Jun 2021 05:13:01 -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 : mime-version : content-transfer-encoding; s=pp1; bh=IUfm4hHXjA3tO1/u80KP22k34ho6fKLAo/bcPYr0QRY=; b=Ssgyb+yQjR3Q8ZKYS7Pno8KToYrbpEdtFjCka6NBwaj4/CYUkFNQ6d3hIR8Cev/9FmOc bVQ3Enl8845j7JAXyGXKFiGqEnzoio9kemog1U/bs4iGeTbtGRuvFptFLw4ph9Lg/6kq B6BnWSYFVoqzfymA9GpxAXOYoKC+aC9gtXRAie+NuyZ3HI+n+G8jIvtYNvtTLn9FgPZ5 6pH0uC3mI0LL6zF3i6bLsLEqFz9vntTTvhfrQztxjALpIYcUmGmrYQHESHpaGLsA/+F2 PQJskPxckzkalBZ9j+eHhbH3R+LpQns3G64kU2bMRznoe8yFLMUbKLCt++yz1sGgpwHN ow== Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 3981hv3s1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Jun 2021 05:13:00 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15H98DRm019356 for ; Thu, 17 Jun 2021 09:12:59 GMT Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by ppma01dal.us.ibm.com with ESMTP id 394mjasa0j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Jun 2021 09:12:59 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15H9CwZd12976594 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Jun 2021 09:12:58 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2AE0EBE04F; Thu, 17 Jun 2021 09:12:58 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D255FBE058; Thu, 17 Jun 2021 09:12:57 +0000 (GMT) Received: from localhost.localdomain (unknown [9.2.130.16]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 17 Jun 2021 09:12:57 +0000 (GMT) From: "Dov Murik" To: devel@edk2.groups.io Cc: Dov Murik Subject: [PATCH v2 2/3] OvmfPkg/GenericQemuLoadImageLib: Read cmdline from QemuKernelLoaderFs Date: Thu, 17 Jun 2021 09:12:43 +0000 Message-Id: <20210617091244.2667569-3-dovmurik@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210617091244.2667569-1-dovmurik@linux.ibm.com> References: <20210617091244.2667569-1-dovmurik@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 59j69nITB9qOIq5o-ZNDPVxwchbGJf7H X-Proofpoint-ORIG-GUID: 59j69nITB9qOIq5o-ZNDPVxwchbGJf7H X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-06-17_05:2021-06-15,2021-06-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 bulkscore=0 phishscore=0 mlxlogscore=999 clxscore=1015 priorityscore=1501 mlxscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106170063 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". Signed-off-by: Dov Murik --- OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf | 2 = +- OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c | 145 = ++++++++++++++++++-- 2 files changed, 133 insertions(+), 14 deletions(-) diff --git a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLi= b.inf b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf index b262cb926a4d..f462fd6922cf 100644 --- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf +++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf @@ -27,12 +27,12 @@ [LibraryClasses] DebugLib=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 114db7e8441f..f520456e3b24 100644 --- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c +++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c @@ -11,9 +11,9 @@ #include =0D #include =0D #include =0D +#include =0D #include =0D #include =0D -#include =0D #include =0D #include =0D #include =0D @@ -30,6 +30,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 +56,78 @@ STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDeviceP= ath =3D { }=0D };=0D =0D +STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mQemuKernelLoaderFileSystemDevic= ePath =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 + *Size =3D 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 +153,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 +205,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 read the "initrd" and "cmdline" synthetic files.=0D + //=0D + DevicePathNode =3D (EFI_DEVICE_PATH_PROTOCOL *)&mQemuKernelLoaderFileSys= temDevicePath;=0D + Status =3D gBS->LocateDevicePath (=0D + &gEfiSimpleFileSystemProtocolGuid,=0D + &DevicePathNode,=0D + &FsVolumeHandle=0D + );=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D +=0D + Status =3D gBS->HandleProtocol (=0D + FsVolumeHandle,=0D + &gEfiSimpleFileSystemProtocolGuid,=0D + (VOID **)&FsProtocol=0D + );=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D +=0D + Status =3D FsProtocol->OpenVolume (FsVolumeHandle, &Root);=0D + if (EFI_ERROR (Status)) {=0D + return Status;=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 @@ -136,8 +247,11 @@ QemuLoadKernelImage ( goto UnloadImage;=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 +269,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 @@ -193,6 +309,7 @@ QemuLoadKernelImage ( }=0D =0D *ImageHandle =3D KernelImageHandle;=0D + Root->Close (Root);=0D return EFI_SUCCESS;=0D =0D FreeCommandLine:=0D @@ -201,6 +318,8 @@ FreeCommandLine: }=0D UnloadImage:=0D gBS->UnloadImage (KernelImageHandle);=0D +CloseRoot:=0D + Root->Close (Root);=0D =0D return Status;=0D }=0D --=20 2.25.1