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 7C96B2110BFD7 for ; Tue, 18 Sep 2018 06:47:29 -0700 (PDT) Received: by mail-it0-x242.google.com with SMTP id f14-v6so3232041ita.4 for ; Tue, 18 Sep 2018 06:47:29 -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=Ij5o3WaeO908lxMXGVy8G2+hU4707FFc4axR6QkBgA8=; b=AtTEkk7WLDUWn/XidQzMvsaxEXlKqCd/GH9GEpQG5AcAK0bK4umwLAyECogFHRzuMV cQa+av+XhG9xMhf824y4IQb69NEJs6V+U8yfqgSZK5ExPqrljoyqZUbd3ff0It4qWHRy QZF4YenR/hGsbl1AFPpm8+voqM1BdWNe7rjjk= 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=Ij5o3WaeO908lxMXGVy8G2+hU4707FFc4axR6QkBgA8=; b=n5yiiXLRg7CjROFLB2pbZfsVRwNSAyUMJUB1wPYuExwt3VQzB/yZozJ86lV8bP+sj5 rr85wlWLGqgHdBLYbu8Gp70TtTnYHhL46vpASBRy5fBCUp9+pkwCe6Q3ha/1yiDG0KfD 8moY1Lg1+Nre5lhWIBgk4GAba21WJPxDcJN02c1M2RPW7H6mqQbz/oZyNmoy7cHeDwGk j24M9o4dgFZOgUmbWrJGHV/bEkd7TXO0Vogih14B9RdweyVso8K2PTqfMJVa8Rg+2cBo TyzIS/ANQngoNtBe7znhCrDUXCweMD9bmJsq/LRvdHhPXIC8NyysJvb6XYwTOu7yQzMd GsCQ== X-Gm-Message-State: APzg51C1IwbAL0Ob15GepwX2O91RTXyxrYSc682IqcrC7VDCpxgz8BJi 5cyo9B3wAhbLCu48cXJvCKhm9d1ybgXIHjMU4ma1Gw== X-Google-Smtp-Source: ANB0VdYCMgNKmEF6URkmdBEktCFs1jZ9jBWifUeMFojksPnN50NoBB+Nmxe33A80pOwxw2/HrUY7aC2b35mP5BhTyfE= X-Received: by 2002:a02:59cc:: with SMTP id v73-v6mr27543362jad.5.1537278448190; Tue, 18 Sep 2018 06:47:28 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:2848:0:0:0:0:0 with HTTP; Tue, 18 Sep 2018 06:47:27 -0700 (PDT) In-Reply-To: <286cf4b7-853d-8dcf-f519-46db5359c851@Intel.com> References: <20180915132859.25727-1-ard.biesheuvel@linaro.org> <20180915132859.25727-8-ard.biesheuvel@linaro.org> <286cf4b7-853d-8dcf-f519-46db5359c851@Intel.com> From: Ard Biesheuvel Date: Tue, 18 Sep 2018 06:47:27 -0700 Message-ID: To: "Ni, Ruiyu" Cc: "edk2-devel@lists.01.org" , Vincent Zimmer , Brian Richardson , Michael D Kinney , Andrew Fish , Leif Lindholm , Star Zeng , Eric Dong , Liming Gao , Jaben Carsey , Steven Shi Subject: Re: [PATCH v2 7/7] MdeModulePkg/DxeCore: remove explicit EBC handling 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: Tue, 18 Sep 2018 13:47:29 -0000 Content-Type: text/plain; charset="UTF-8" On 18 September 2018 at 02:05, Ni, Ruiyu wrote: > On 9/15/2018 9:28 PM, Ard Biesheuvel wrote: >> >> Now that the EBC machine type is no longer classified as a >> natively supported machine type on the architectures that can >> support it via the EBC interpreter, the EBC specific handling >> in DXE core is no longer used and can be removed. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Ard Biesheuvel >> --- >> MdeModulePkg/Core/Dxe/DxeMain.h | 3 -- >> MdeModulePkg/Core/Dxe/DxeMain.inf | 1 - >> MdeModulePkg/Core/Dxe/Image/Image.c | 53 ++------------------ >> 3 files changed, 3 insertions(+), 54 deletions(-) >> >> diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h >> b/MdeModulePkg/Core/Dxe/DxeMain.h >> index ff2418c5ae5e..c473006813fe 100644 >> --- a/MdeModulePkg/Core/Dxe/DxeMain.h >> +++ b/MdeModulePkg/Core/Dxe/DxeMain.h >> @@ -42,7 +42,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, >> EITHER EXPRESS OR IMPLIED. >> #include >> #include >> #include >> -#include >> #include >> #include >> #include >> @@ -228,8 +227,6 @@ typedef struct { >> BASE_LIBRARY_JUMP_BUFFER *JumpContext; >> /// Machine type from PE image >> UINT16 Machine; >> - /// EBC Protocol pointer >> - EFI_EBC_PROTOCOL *Ebc; >> /// PE/COFF Image Emulator Protocol pointer >> EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *PeCoffEmu; >> /// Runtime image list >> diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf >> b/MdeModulePkg/Core/Dxe/DxeMain.inf >> index 63e650ee7c27..a969b869b331 100644 >> --- a/MdeModulePkg/Core/Dxe/DxeMain.inf >> +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf >> @@ -161,7 +161,6 @@ >> gEfiLoadedImageProtocolGuid ## PRODUCES >> gEfiLoadedImageDevicePathProtocolGuid ## PRODUCES >> gEfiHiiPackageListProtocolGuid ## SOMETIMES_PRODUCES >> - gEfiEbcProtocolGuid ## SOMETIMES_CONSUMES >> gEfiSmmBase2ProtocolGuid ## SOMETIMES_CONSUMES >> gEfiBlockIoProtocolGuid ## SOMETIMES_CONSUMES >> gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES >> diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c >> b/MdeModulePkg/Core/Dxe/Image/Image.c >> index 0a4bb3644af0..902a44455fdd 100644 >> --- a/MdeModulePkg/Core/Dxe/Image/Image.c >> +++ b/MdeModulePkg/Core/Dxe/Image/Image.c >> @@ -66,7 +66,6 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage = { >> NULL, // JumpBuffer >> NULL, // JumpContext >> 0, // Machine >> - NULL, // Ebc >> NULL, // PeCoffEmu >> NULL, // RuntimeData >> NULL // LoadedImageDevicePath >> @@ -83,9 +82,6 @@ typedef struct { >> CHAR16 *MachineTypeName; >> } MACHINE_TYPE_INFO; >> -// >> -// EBC machine is not listed in this table, because EBC is in the default >> supported scopes of other machine type. >> -// >> GLOBAL_REMOVE_IF_UNREFERENCED MACHINE_TYPE_INFO mMachineTypeInfo[] = { >> {EFI_IMAGE_MACHINE_IA32, L"IA32"}, >> {EFI_IMAGE_MACHINE_IA64, L"IA64"}, >> @@ -705,51 +701,15 @@ CoreLoadPeImage ( >> InvalidateInstructionCacheRange ((VOID >> *)(UINTN)Image->ImageContext.ImageAddress, >> (UINTN)Image->ImageContext.ImageSize); >> // >> - // Copy the machine type from the context to the image private data. >> This >> - // is needed during image unload to know if we should call an EBC >> protocol >> - // to unload the image. >> + // Copy the machine type from the context to the image private data. >> // >> Image->Machine = Image->ImageContext.Machine; >> // >> - // Get the image entry point. If it's an EBC image, then call into the >> - // interpreter to create a thunk for the entry point and use the >> returned >> - // value for the entry point. >> + // Get the image entry point. >> // >> Image->EntryPoint = >> (EFI_IMAGE_ENTRY_POINT)(UINTN)Image->ImageContext.EntryPoint; >> - if (Image->ImageContext.Machine == EFI_IMAGE_MACHINE_EBC) { >> - // >> - // Locate the EBC interpreter protocol >> - // >> - Status = CoreLocateProtocol (&gEfiEbcProtocolGuid, NULL, (VOID >> **)&Image->Ebc); >> - if (EFI_ERROR(Status) || Image->Ebc == NULL) { >> - DEBUG ((DEBUG_LOAD | DEBUG_ERROR, "CoreLoadPeImage: There is no EBC >> interpreter for an EBC image.\n")); >> - goto Done; >> - } >> - >> - // >> - // Register a callback for flushing the instruction cache so that >> created >> - // thunks can be flushed. >> - // >> - Status = Image->Ebc->RegisterICacheFlush (Image->Ebc, >> (EBC_ICACHE_FLUSH)InvalidateInstructionCacheRange); >> - if (EFI_ERROR(Status)) { >> - goto Done; >> - } >> - >> - // >> - // Create a thunk for the image's entry point. This will be the new >> - // entry point for the image. >> - // >> - Status = Image->Ebc->CreateThunk ( >> - Image->Ebc, >> - Image->Handle, >> - (VOID *)(UINTN) >> Image->ImageContext.EntryPoint, >> - (VOID **) &Image->EntryPoint >> - ); >> - if (EFI_ERROR(Status)) { >> - goto Done; >> - } >> - } else if (Image->PeCoffEmu != NULL) { >> + if (Image->PeCoffEmu != NULL) { >> Status = Image->PeCoffEmu->RegisterImage (Image->PeCoffEmu, >> Image->ImageBasePage, >> EFI_PAGES_TO_SIZE >> (Image->NumberOfPages), >> @@ -939,13 +899,6 @@ CoreUnloadAndCloseImage ( >> UnprotectUefiImage (&Image->Info, Image->LoadedImageDevicePath); >> - if (Image->Ebc != NULL) { >> - // >> - // If EBC protocol exists we must perform cleanups for this image. >> - // >> - Image->Ebc->UnloadImage (Image->Ebc, Image->Handle); >> - } >> - >> if (Image->PeCoffEmu != NULL) { >> // >> // If the PE/COFF Emulator protocol exists we must unregister the >> image. >> > > Ard, > Does this change mean EBC and x86 won't be enabled together? > I am not sure I understand your question, so let me just explain again what the purpose is of this patch. In the preceding patches, the EBC driver is updated so it implements the PE/COFF emulator protocol, which is a more generic way of exposing emulator/interpreter functionality to other modules, and the DXE core and UefiBaseTypes.h are updated so that EBC modules will be handled using this new protocol (PE/COFF images that we not built for the native architecture are handed to each existing instance of the PE/COFF emulator protocol until one is found that supports it). This means the explicit EBC handling is new dead code, so it can be removed. On AARCH64 with the X86 emulator installed, EBC and X86 PE/COFF images can both be dispatched. On builds with only the EBC driver installed (AARCH64 or otherwise), only EBC images and native images can be executed. I hope this answers your question.