1. Patchew
  2. EDK2
  3. [edk2-devel] [Patch V3 0/2] Change the usage of input parameter ProcessorNumber in MpInitLibGetProcessorInfo() of MpInitLibUp
  4. View patch

[edk2-devel] [Patch V3 1/2] UefiCpuPkg: set EXTENDED_PROCESSOR_INFORMATION to 0

duntan posted 2 patches 1 year, 11 months ago
[edk2-devel] [Patch V3 1/2] UefiCpuPkg: set EXTENDED_PROCESSOR_INFORMATION to 0
Posted by duntan 1 year, 11 months ago 
Set EXTENDED_PROCESSOR_INFORMATION to 0 in API
MpInitLibGetProcessorInfo() of MpInitLibUp. This
commit use ZeroMem() to set all fileds in output
EFI_PROCESSOR_INFORMATION to 0 before StatusFlag
field is reassigned.

Previously EXTENDED_PROCESSOR_INFORMATION in the API
MpInitLibGetProcessorInfo() of MpInitLibUp is ignored.
In PEI/DXE MpInitLib, EXTENDED_PROCESSOR_INFORMATION
will be retrived when BIT24 of input ProcessorNumber
is set. This commit can avoid garbage in the output
structure in MpInitLibGetProcessorInfo() of MpInitLibUp.

Signed-off-by: Dun Tan <dun.tan@intel.com>
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: Min Xu <min.m.xu@intel.com>
---
 UefiCpuPkg/Include/Library/MpInitLib.h         |  2 ++
 UefiCpuPkg/Library/MpInitLib/MpLib.c           |  2 ++
 UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c   | 15 ++++++++-------
 UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/UefiCpuPkg/Include/Library/MpInitLib.h b/UefiCpuPkg/Include/Library/MpInitLib.h
index 1853c46415..842c6f7ff9 100644
--- a/UefiCpuPkg/Include/Library/MpInitLib.h
+++ b/UefiCpuPkg/Include/Library/MpInitLib.h
@@ -63,6 +63,8 @@ MpInitLibGetNumberOfProcessors (
   instant this call is made. This service may only be called from the BSP.
 
   @param[in]  ProcessorNumber       The handle number of processor.
+                                    Lower 24 bits contains the actual processor number.
+                                    BIT24 indicates if the EXTENDED_PROCESSOR_INFORMATION will be retrived.
   @param[out] ProcessorInfoBuffer   A pointer to the buffer where information for
                                     the requested processor is deposited.
   @param[out] HealthData            Return processor health data.
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index a359906923..cdfb570e61 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -2333,6 +2333,8 @@ MpInitLibInitialize (
   instant this call is made. This service may only be called from the BSP.
 
   @param[in]  ProcessorNumber       The handle number of processor.
+                                    Lower 24 bits contains the actual processor number.
+                                    BIT24 indicates if the EXTENDED_PROCESSOR_INFORMATION will be retrived.
   @param[out] ProcessorInfoBuffer   A pointer to the buffer where information for
                                     the requested processor is deposited.
   @param[out]  HealthData            Return processor health data.
diff --git a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
index 86f9fbf903..d4f8611af8 100644
--- a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
+++ b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
@@ -12,6 +12,7 @@
 #include <Library/DebugLib.h>
 #include <Library/LocalApicLib.h>
 #include <Library/HobLib.h>
+#include <Library/BaseMemoryLib.h>
 
 /**
   MP Initialize Library initialization.
@@ -77,6 +78,8 @@ MpInitLibGetNumberOfProcessors (
   instant this call is made. This service may only be called from the BSP.
 
   @param[in]  ProcessorNumber       The handle number of processor.
+                                    Lower 24 bits contains the actual processor number.
+                                    BIT24 indicates if the EXTENDED_PROCESSOR_INFORMATION will be retrived.
   @param[out] ProcessorInfoBuffer   A pointer to the buffer where information for
                                     the requested processor is deposited.
   @param[out] HealthData            Return processor health data.
@@ -108,13 +111,11 @@ MpInitLibGetProcessorInfo (
     return EFI_NOT_FOUND;
   }
 
-  ProcessorInfoBuffer->ProcessorId = 0;
-  ProcessorInfoBuffer->StatusFlag  = PROCESSOR_AS_BSP_BIT  |
-                                     PROCESSOR_ENABLED_BIT |
-                                     PROCESSOR_HEALTH_STATUS_BIT;
-  ProcessorInfoBuffer->Location.Package = 0;
-  ProcessorInfoBuffer->Location.Core    = 0;
-  ProcessorInfoBuffer->Location.Thread  = 0;
+  ZeroMem (ProcessorInfoBuffer, sizeof (*ProcessorInfoBuffer));
+  ProcessorInfoBuffer->StatusFlag = PROCESSOR_AS_BSP_BIT  |
+                                    PROCESSOR_ENABLED_BIT |
+                                    PROCESSOR_HEALTH_STATUS_BIT;
+
   if (HealthData != NULL) {
     GuidHob = GetFirstGuidHob (&gEfiSecPlatformInformationPpiGuid);
     if (GuidHob != NULL) {
diff --git a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
index 24ad29c03c..eb0a168f74 100644
--- a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
+++ b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
@@ -32,6 +32,7 @@
   DebugLib
   LocalApicLib
   HobLib
+  BaseMemoryLib
 
 [Ppis]
   gEfiSecPlatformInformationPpiGuid  ## SOMETIMES_CONSUMES
-- 
2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113355): https://edk2.groups.io/g/devel/message/113355
Mute This Topic: https://groups.io/mt/103592278/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch V3 1/2] UefiCpuPkg: set EXTENDED_PROCESSOR_INFORMATION to 0
Posted by Ni, Ray 1 year, 11 months ago 
Reviewed-by: Ray Ni <ray.ni@intel.com>

Thanks,
Ray
> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Monday, January 8, 2024 1:08 PM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Laszlo Ersek <lersek@redhat.com>; Kumar,
> Rahul R <rahul.r.kumar@intel.com>; Gerd Hoffmann <kraxel@redhat.com>;
> Xu, Min M <min.m.xu@intel.com>
> Subject: [Patch V3 1/2] UefiCpuPkg: set
> EXTENDED_PROCESSOR_INFORMATION to 0
> 
> Set EXTENDED_PROCESSOR_INFORMATION to 0 in API
> MpInitLibGetProcessorInfo() of MpInitLibUp. This
> commit use ZeroMem() to set all fileds in output
> EFI_PROCESSOR_INFORMATION to 0 before StatusFlag
> field is reassigned.
> 
> Previously EXTENDED_PROCESSOR_INFORMATION in the API
> MpInitLibGetProcessorInfo() of MpInitLibUp is ignored.
> In PEI/DXE MpInitLib, EXTENDED_PROCESSOR_INFORMATION
> will be retrived when BIT24 of input ProcessorNumber
> is set. This commit can avoid garbage in the output
> structure in MpInitLibGetProcessorInfo() of MpInitLibUp.
> 
> Signed-off-by: Dun Tan <dun.tan@intel.com>
> 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: Min Xu <min.m.xu@intel.com>
> ---
>  UefiCpuPkg/Include/Library/MpInitLib.h         |  2 ++
>  UefiCpuPkg/Library/MpInitLib/MpLib.c           |  2 ++
>  UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c   | 15 ++++++++-------
>  UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf |  1 +
>  4 files changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/UefiCpuPkg/Include/Library/MpInitLib.h
> b/UefiCpuPkg/Include/Library/MpInitLib.h
> index 1853c46415..842c6f7ff9 100644
> --- a/UefiCpuPkg/Include/Library/MpInitLib.h
> +++ b/UefiCpuPkg/Include/Library/MpInitLib.h
> @@ -63,6 +63,8 @@ MpInitLibGetNumberOfProcessors (
>    instant this call is made. This service may only be called from the BSP.
> 
>    @param[in]  ProcessorNumber       The handle number of processor.
> +                                    Lower 24 bits contains the actual processor number.
> +                                    BIT24 indicates if the
> EXTENDED_PROCESSOR_INFORMATION will be retrived.
>    @param[out] ProcessorInfoBuffer   A pointer to the buffer where
> information for
>                                      the requested processor is deposited.
>    @param[out] HealthData            Return processor health data.
> diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c
> b/UefiCpuPkg/Library/MpInitLib/MpLib.c
> index a359906923..cdfb570e61 100644
> --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
> +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
> @@ -2333,6 +2333,8 @@ MpInitLibInitialize (
>    instant this call is made. This service may only be called from the BSP.
> 
>    @param[in]  ProcessorNumber       The handle number of processor.
> +                                    Lower 24 bits contains the actual processor number.
> +                                    BIT24 indicates if the
> EXTENDED_PROCESSOR_INFORMATION will be retrived.
>    @param[out] ProcessorInfoBuffer   A pointer to the buffer where
> information for
>                                      the requested processor is deposited.
>    @param[out]  HealthData            Return processor health data.
> diff --git a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
> b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
> index 86f9fbf903..d4f8611af8 100644
> --- a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
> +++ b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.c
> @@ -12,6 +12,7 @@
>  #include <Library/DebugLib.h>
>  #include <Library/LocalApicLib.h>
>  #include <Library/HobLib.h>
> +#include <Library/BaseMemoryLib.h>
> 
>  /**
>    MP Initialize Library initialization.
> @@ -77,6 +78,8 @@ MpInitLibGetNumberOfProcessors (
>    instant this call is made. This service may only be called from the BSP.
> 
>    @param[in]  ProcessorNumber       The handle number of processor.
> +                                    Lower 24 bits contains the actual processor number.
> +                                    BIT24 indicates if the
> EXTENDED_PROCESSOR_INFORMATION will be retrived.
>    @param[out] ProcessorInfoBuffer   A pointer to the buffer where
> information for
>                                      the requested processor is deposited.
>    @param[out] HealthData            Return processor health data.
> @@ -108,13 +111,11 @@ MpInitLibGetProcessorInfo (
>      return EFI_NOT_FOUND;
>    }
> 
> -  ProcessorInfoBuffer->ProcessorId = 0;
> -  ProcessorInfoBuffer->StatusFlag  = PROCESSOR_AS_BSP_BIT  |
> -                                     PROCESSOR_ENABLED_BIT |
> -                                     PROCESSOR_HEALTH_STATUS_BIT;
> -  ProcessorInfoBuffer->Location.Package = 0;
> -  ProcessorInfoBuffer->Location.Core    = 0;
> -  ProcessorInfoBuffer->Location.Thread  = 0;
> +  ZeroMem (ProcessorInfoBuffer, sizeof (*ProcessorInfoBuffer));
> +  ProcessorInfoBuffer->StatusFlag = PROCESSOR_AS_BSP_BIT  |
> +                                    PROCESSOR_ENABLED_BIT |
> +                                    PROCESSOR_HEALTH_STATUS_BIT;
> +
>    if (HealthData != NULL) {
>      GuidHob = GetFirstGuidHob (&gEfiSecPlatformInformationPpiGuid);
>      if (GuidHob != NULL) {
> diff --git a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
> b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
> index 24ad29c03c..eb0a168f74 100644
> --- a/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
> +++ b/UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf
> @@ -32,6 +32,7 @@
>    DebugLib
>    LocalApicLib
>    HobLib
> +  BaseMemoryLib
> 
>  [Ppis]
>    gEfiSecPlatformInformationPpiGuid  ## SOMETIMES_CONSUMES
> --
> 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113433): https://edk2.groups.io/g/devel/message/113433
Mute This Topic: https://groups.io/mt/103592278/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-b67e4c2

© 2016 - 2025 Red Hat, Inc.