Reviewed-by: Ray Ni <ray...@intel.com>
Can you please submit another patch to remove AsmWriteCr3() in
ConvertMemoryPageToNotPresent() as CpuFlushTlb() has been called later?
Thanks,
Ray
> -----Original Message-----
> From: Liu, Zhiguang <zhiguang....@intel.com>
> Sent: Friday, December 29, 2023 11:30 AM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang....@intel.com>; Ni, Ray <ray...@intel.com>;
> Laszlo Ersek <ler...@redhat.com>; Kumar, Rahul R
> <rahul.r.ku...@intel.com>; Gerd Hoffmann <kra...@redhat.com>; Zeng, Star
> <star.z...@intel.com>; Li, Daoxiang <daoxiang...@intel.com>
> Subject: [PATCH] UefiCpuPkg/CpuMpPei: Parallel get stack base for better
> performance.
>
> Parallel run the function GetStackBase for all APs for better
> performance.
>
> Cc: Ray Ni <ray...@intel.com>
> Cc: Laszlo Ersek <ler...@redhat.com>
> Cc: Rahul Kumar <rahul1.ku...@intel.com>
> Cc: Gerd Hoffmann <kra...@redhat.com>
> Cc: Star Zeng <star.z...@intel.com>
> Cc: Daoxiang Li <daoxiang...@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang....@intel.com>
> ---
> UefiCpuPkg/CpuMpPei/CpuPaging.c | 56 +++++++++++++++++----------------
> 1 file changed, 29 insertions(+), 27 deletions(-)
>
> diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> b/UefiCpuPkg/CpuMpPei/CpuPaging.c
> index 2dd7237141..15c7015fb8 100644
> --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c
> @@ -267,13 +267,15 @@ GetStackBase (
> )
> {
> EFI_PHYSICAL_ADDRESS StackBase;
> + UINTN Index;
>
> + MpInitLibWhoAmI (&Index);
> StackBase = (EFI_PHYSICAL_ADDRESS)(UINTN)&StackBase;
> StackBase += BASE_4KB;
> StackBase &= ~((EFI_PHYSICAL_ADDRESS)BASE_4KB - 1);
> StackBase -= PcdGet32 (PcdCpuApStackSize);
>
> - *(EFI_PHYSICAL_ADDRESS *)Buffer = StackBase;
> + *((EFI_PHYSICAL_ADDRESS *)Buffer + Index) = StackBase;
> }
>
> /**
> @@ -287,7 +289,7 @@ SetupStackGuardPage (
> )
> {
> EFI_PEI_HOB_POINTERS Hob;
> - EFI_PHYSICAL_ADDRESS StackBase;
> + EFI_PHYSICAL_ADDRESS *StackBase;
> UINTN NumberOfProcessors;
> UINTN Bsp;
> UINTN Index;
> @@ -308,44 +310,44 @@ SetupStackGuardPage (
> NumberOfProcessors = 1;
> }
>
> + StackBase = (EFI_PHYSICAL_ADDRESS *)AllocatePages
> (EFI_SIZE_TO_PAGES (sizeof (EFI_PHYSICAL_ADDRESS) *
> NumberOfProcessors));
> + ASSERT (StackBase != NULL);
> + if (StackBase == NULL) {
> + return;
> + }
> +
> + ZeroMem (StackBase, sizeof (EFI_PHYSICAL_ADDRESS) *
> NumberOfProcessors);
> + MpInitLibStartupAllAPs (GetStackBase, FALSE, NULL, 0, (VOID *)StackBase,
> NULL);
> MpInitLibWhoAmI (&Bsp);
> - for (Index = 0; Index < NumberOfProcessors; ++Index) {
> - StackBase = 0;
> -
> - if (Index == Bsp) {
> - Hob.Raw = GetHobList ();
> - while ((Hob.Raw = GetNextHob
> (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw)) != NULL) {
> - if (CompareGuid (
> - &gEfiHobMemoryAllocStackGuid,
> - &(Hob.MemoryAllocationStack->AllocDescriptor.Name)
> - ))
> - {
> - StackBase =
> Hob.MemoryAllocationStack->AllocDescriptor.MemoryBaseAddress;
> - break;
> - }
> -
> - Hob.Raw = GET_NEXT_HOB (Hob);
> - }
> - } else {
> - //
> - // Ask AP to return is stack base address.
> - //
> - MpInitLibStartupThisAP (GetStackBase, Index, NULL, 0, (VOID
> *)&StackBase, NULL);
> + Hob.Raw = GetHobList ();
> + while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION,
> Hob.Raw)) != NULL) {
> + if (CompareGuid (
> + &gEfiHobMemoryAllocStackGuid,
> + &(Hob.MemoryAllocationStack->AllocDescriptor.Name)
> + ))
> + {
> + StackBase[Bsp] =
> Hob.MemoryAllocationStack->AllocDescriptor.MemoryBaseAddress;
> + break;
> }
>
> - ASSERT (StackBase != 0);
> + Hob.Raw = GET_NEXT_HOB (Hob);
> + }
> +
> + for (Index = 0; Index < NumberOfProcessors; ++Index) {
> + ASSERT (StackBase[Index] != 0);
> //
> // Set Guard page at stack base address.
> //
> - ConvertMemoryPageToNotPresent (StackBase, EFI_PAGE_SIZE);
> + ConvertMemoryPageToNotPresent (StackBase[Index], EFI_PAGE_SIZE);
> DEBUG ((
> DEBUG_INFO,
> "Stack Guard set at %lx [cpu%lu]!\n",
> - (UINT64)StackBase,
> + (UINT64)StackBase[Index],
> (UINT64)Index
> ));
> }
>
> + FreePages (StackBase, EFI_SIZE_TO_PAGES (sizeof
> (EFI_PHYSICAL_ADDRESS) * NumberOfProcessors));
> //
> // Publish the changes of page table.
> //
> --
> 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113020): https://edk2.groups.io/g/devel/message/113020
Mute This Topic: https://groups.io/mt/103412489/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
