From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::242; helo=mail-it0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x242.google.com (mail-it0-x242.google.com [IPv6:2607:f8b0:4001:c0b::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B9EFE2112E02A for ; Thu, 13 Sep 2018 03:37:30 -0700 (PDT) Received: by mail-it0-x242.google.com with SMTP id f14-v6so7130496ita.4 for ; Thu, 13 Sep 2018 03:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=x3+RgOGafYDameYPyDb2DBtzYmWccdLsW+w2UDNVPoA=; b=Qy1iCUyU3HABuUqxkmRRecU87zlfsKM92lffL1pXFhCLR5DCiKjSGlf2ovSUuw4mvI ADvYhmv2ChGqrF5IDv+QdrvEdWhUGGEiLjXegHkVDBIbSTXsdxL+2HxeuJKVZQr148Y5 8/hhsmfg0NFuFOvlcm8SWc1PSfDQDolZnU4ec= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=x3+RgOGafYDameYPyDb2DBtzYmWccdLsW+w2UDNVPoA=; b=qvgaxLvyjHxv0AB+U8wR/osBjgdAKm8O3j1dY3ZCARQ6jwsNQLx86BvcY36y4tc8uj ojr8o9/MDXrJvJCnFt9LAM/+OOHC3Gy2lM8l8Dse/8IcSLN4x4DY0eFX39IiSkLh94O/ +uoakIeqB39zlliciN1Q9aXT2HQRlh283orR0okKLKPV50RH780/ZH3wzvMd9490HroB JHulGbpcM5bIOV5uJb4Ju7BLinA1ObJ4sUkOt9OFYVlRMlt2g+xkLgy23wwB8p4Ztq47 tvhWbU2cNXjB4BfFuKfiJ85QYGJKN5b1yI5DX2f7NcGvw9p16YLOZbmDWriUkGKC0FcQ 9M/A== X-Gm-Message-State: APzg51AegIMfbVB4RRoLRcxpfYhJ31HhhQDvHf6BdONX27RSID7AX+nX iKVWTJK6y/y5XSrYz7hroLO/0rbeeM5g0CawbfCUf/14KoeL8g== X-Google-Smtp-Source: ANB0VdY9SoBwzmWiMG0kJmpo2oT/YCVuqlgg1GZNbhJWqmz0QiGfzAX2IjHH/NHfulCmyOfm19XyomHsD7oh3rHDt80= X-Received: by 2002:a24:57cb:: with SMTP id u194-v6mr5629656ita.148.1536835049992; Thu, 13 Sep 2018 03:37:29 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:2848:0:0:0:0:0 with HTTP; Thu, 13 Sep 2018 03:37:29 -0700 (PDT) In-Reply-To: <83a42998-1cb2-6adc-188c-8ee6343ae777@intel.com> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> <20180912132151.4258-3-ard.biesheuvel@linaro.org> <83a42998-1cb2-6adc-188c-8ee6343ae777@intel.com> From: Ard Biesheuvel Date: Thu, 13 Sep 2018 12:37:29 +0200 Message-ID: To: "Zeng, Star" Cc: "edk2-devel@lists.01.org" , Ruiyu Ni , Zimmer Vincent , Eric Dong , Andrew Fish , Alexander Graf , Brian Richardson , Michael D Kinney , Laszlo Ersek Subject: Re: [PATCH 2/4] MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2018 10:37:30 -0000 Content-Type: text/plain; charset="UTF-8" On 13 September 2018 at 12:23, Zeng, Star wrote: > On 2018/9/12 21:21, Ard Biesheuvel wrote: >> >> When encountering PE/COFF images that cannot be supported natively, >> attempt to locate an instance of the PE/COFF image emulator protocol, >> and if it supports the image, proceed with loading it and register it >> with the emulator. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel >> --- >> MdeModulePkg/Core/Dxe/DxeMain.h | 3 ++ >> MdeModulePkg/Core/Dxe/DxeMain.inf | 1 + >> MdeModulePkg/Core/Dxe/Image/Image.c | 39 +++++++++++++++++--- >> 3 files changed, 37 insertions(+), 6 deletions(-) >> >> diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h >> b/MdeModulePkg/Core/Dxe/DxeMain.h >> index 7ec82388a3f9..57b3861d9813 100644 >> --- a/MdeModulePkg/Core/Dxe/DxeMain.h >> +++ b/MdeModulePkg/Core/Dxe/DxeMain.h >> @@ -53,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, >> EITHER EXPRESS OR IMPLIED. >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -229,6 +230,8 @@ typedef struct { >> UINT16 Machine; >> /// EBC Protocol pointer >> EFI_EBC_PROTOCOL *Ebc; >> + /// PE/COFF Image Emulator Protocol pointer >> + EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emu; > > > Hi Ard, > > How about using PeCoffEmu as the name to be more specific? > Good idea. > >> /// Runtime image list >> EFI_RUNTIME_IMAGE_ENTRY *RuntimeData; >> /// Pointer to Loaded Image Device Path Protocol >> diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf >> b/MdeModulePkg/Core/Dxe/DxeMain.inf >> index 68fa0a01d9bd..d7591aa0da6d 100644 >> --- a/MdeModulePkg/Core/Dxe/DxeMain.inf >> +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf >> @@ -180,6 +180,7 @@ >> gEfiVariableArchProtocolGuid ## CONSUMES >> gEfiCapsuleArchProtocolGuid ## CONSUMES >> gEfiWatchdogTimerArchProtocolGuid ## CONSUMES >> + gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES >> [FeaturePcd] >> gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## >> CONSUMES >> diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c >> b/MdeModulePkg/Core/Dxe/Image/Image.c >> index eddca140ee1a..e2dd80790657 100644 >> --- a/MdeModulePkg/Core/Dxe/Image/Image.c >> +++ b/MdeModulePkg/Core/Dxe/Image/Image.c >> @@ -67,6 +67,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage = { >> NULL, // JumpContext >> 0, // Machine >> NULL, // Ebc >> + NULL, // Emu >> NULL, // RuntimeData >> NULL // LoadedImageDevicePath >> }; >> @@ -476,12 +477,23 @@ CoreLoadPeImage ( >> if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->ImageContext.Machine)) { >> if (!EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED >> (Image->ImageContext.Machine)) { >> // >> - // The PE/COFF loader can support loading image types that can be >> executed. >> - // If we loaded an image type that we can not execute return >> EFI_UNSUPORTED. >> + // Locate the emulator protocol to check whether it supports this >> + // image. >> // >> - DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", >> GetMachineTypeName(Image->ImageContext.Machine))); >> - DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", >> GetMachineTypeName(mDxeCoreImageMachineType))); >> - return EFI_UNSUPPORTED; >> + Status = CoreLocateProtocol >> (&gEdkiiPeCoffImageEmulatorProtocolGuid, >> + NULL, (VOID **)&Image->Emu); >> + if (EFI_ERROR (Status) || >> + !Image->Emu->IsImageSupported (Image->Emu, >> + Image->ImageContext.Machine, >> + Image->ImageContext.ImageType)) >> { >> + // >> + // The PE/COFF loader can support loading image types that can be >> executed. >> + // If we loaded an image type that we can not execute return >> EFI_UNSUPORTED. >> + // >> + DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", >> GetMachineTypeName(Image->ImageContext.Machine))); >> + DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", >> GetMachineTypeName(mDxeCoreImageMachineType))); >> + return EFI_UNSUPPORTED; >> + } >> } >> } >> @@ -687,6 +699,14 @@ CoreLoadPeImage ( >> if (EFI_ERROR(Status)) { >> goto Done; >> } >> + } else if (Image->Emu != NULL) { >> + Status = Image->Emu->RegisterImage (Image->Emu, Image->ImageBasePage, >> + EFI_PAGES_TO_SIZE (Image->NumberOfPages)); >> + if (EFI_ERROR (Status)) { >> + DEBUG ((DEBUG_LOAD | DEBUG_ERROR, >> + "CoreLoadPeImage: Failed to load register foreign image with >> emulator.\n")); > > > 'load' should not be in the sentence, right? > Correct. I will remove it. >> + goto Done; >> + } >> } >> // >> @@ -874,6 +894,13 @@ CoreUnloadAndCloseImage ( >> Image->Ebc->UnloadImage (Image->Ebc, Image->Handle); >> } >> + if (Image->Emu != NULL) { >> + // >> + // If the PE/COFF Emulator protocol exists we must unregister the >> image. >> + // >> + Image->Emu->UnregisterImage (Image->Emu, Image->ImageBasePage); >> + } >> + >> // >> // Unload image, free Image->ImageContext->ModHandle >> // >> @@ -1599,7 +1626,7 @@ CoreStartImage ( >> // >> // The image to be started must have the machine type supported by >> DxeCore. >> // >> - if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine)) { >> + if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine) && Image->Emu == >> NULL) { >> // >> // Do not ASSERT here, because image might be loaded via >> EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED >> // But it can not be started. >> >