Re: [edk2-devel] [Patch v2 1/2] MdeModulePkg/Core/Dxe: Initialize GCD before RT memory allocations

["Laszlo Ersek" <lersek@redhat.com>]

On 1/29/24 04:45, Michael D Kinney wrote:
> Update the DxeMain initialization order to initialize GCD
> services before any runtime allocations are performed.  This
> is required to prevent runtime data fragmentation when the
> UEFI System Table and UEFI Runtime Service Table are allocated
> before both the memory and GCD services are initialized.
> 
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Aaron Li <aaron.li@intel.com>
> Cc: Liu Yun <yun.y.liu@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 23 ++++++++++++++---------
>  MdeModulePkg/Core/Dxe/Image/Image.c     |  1 -
>  2 files changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> index 0e0f9769b99d..17d510a287e5 100644
> --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> @@ -276,6 +276,18 @@ DxeMain (
>  
>    MemoryProfileInit (HobStart);
>  
> +  //
> +  // Start the Image Services.
> +  //
> +  Status = CoreInitializeImageServices (HobStart);
> +  ASSERT_EFI_ERROR (Status);
> +
> +  //
> +  // Initialize the Global Coherency Domain Services
> +  //
> +  Status = CoreInitializeGcdServices (&HobStart, MemoryBaseAddress, MemoryLength);
> +  ASSERT_EFI_ERROR (Status);
> +
>    //
>    // Allocate the EFI System Table and EFI Runtime Service Table from EfiRuntimeServicesData
>    // Use the templates to initialize the contents of the EFI System Table and EFI Runtime Services Table
> @@ -289,16 +301,9 @@ DxeMain (
>    gDxeCoreST->RuntimeServices = gDxeCoreRT;
>  
>    //
> -  // Start the Image Services.
> +  // Update DXE Core Loaded Image Protocol with allocated UEFI System Table
>    //
> -  Status = CoreInitializeImageServices (HobStart);
> -  ASSERT_EFI_ERROR (Status);
> -
> -  //
> -  // Initialize the Global Coherency Domain Services
> -  //
> -  Status = CoreInitializeGcdServices (&HobStart, MemoryBaseAddress, MemoryLength);
> -  ASSERT_EFI_ERROR (Status);
> +  gDxeCoreLoadedImage->SystemTable = gDxeCoreST;
>  
>    //
>    // Call constructor for all libraries
> diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
> index 6bc3a549ae5e..3fc74eb9fd6b 100644
> --- a/MdeModulePkg/Core/Dxe/Image/Image.c
> +++ b/MdeModulePkg/Core/Dxe/Image/Image.c
> @@ -222,7 +222,6 @@ CoreInitializeImageServices (
>    Image->ImageBasePage    = DxeCoreImageBaseAddress;
>    Image->NumberOfPages    = (UINTN)(EFI_SIZE_TO_PAGES ((UINTN)(DxeCoreImageLength)));
>    Image->Tpl              = gEfiCurrentTpl;
> -  Image->Info.SystemTable = gDxeCoreST;
>    Image->Info.ImageBase   = (VOID *)(UINTN)DxeCoreImageBaseAddress;
>    Image->Info.ImageSize   = DxeCoreImageLength;
>  

Reviewed-by: Laszlo Ersek <lersek@redhat.com>



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114741): https://edk2.groups.io/g/devel/message/114741
Mute This Topic: https://groups.io/mt/104025661/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-