1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] UefiCpuPkg/CpuMpPei: Parallel get stack base for better performance.

Zhiguang Liu posted 1 patch 4 months ago
Failed in applying to current master (apply log)
UefiCpuPkg/CpuMpPei/CpuPaging.c | 56 +++++++++++++++++----------------
1 file changed, 29 insertions(+), 27 deletions(-)
[edk2-devel] [PATCH] UefiCpuPkg/CpuMpPei: Parallel get stack base for better performance.
Posted by Zhiguang Liu 4 months ago 
Parallel run the function GetStackBase for all APs for better
performance.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Daoxiang Li <daoxiang.li@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@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 (#112996): https://edk2.groups.io/g/devel/message/112996
Mute This Topic: https://groups.io/mt/103412489/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] UefiCpuPkg/CpuMpPei: Parallel get stack base for better performance.
Posted by Ni, Ray 4 months ago 
Reviewed-by: Ray Ni <ray.ni@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.liu@intel.com>
> Sent: Friday, December 29, 2023 11:30 AM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Laszlo Ersek <lersek@redhat.com>; Kumar, Rahul R
> <rahul.r.kumar@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Zeng, Star
> <star.zeng@intel.com>; Li, Daoxiang <daoxiang.li@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.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Daoxiang Li <daoxiang.li@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.