[PATCH v2] UefiCpuPkg/CpuMpPei: fix vs2012 build error

[PATCH v2] UefiCpuPkg/CpuMpPei: fix vs2012 build error

[Jian J Wang]

> v2 changes:
>   Incorpate Laszlo's reivew comments
>   a. change title
>   b. drop unrelated changes
>   c. remove error message

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1166

Visual Studio 2012 will complain uninitialized variable, StackBase,
in the CpuPaging.c. This patch adds code to init it to zero and
ASSERT check against 0. This is enough since uninit case will only
happen during retrieving stack memory via gEfiHobMemoryAllocStackGuid.
But this HOB will always be created in advance.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
---
 UefiCpuPkg/CpuMpPei/CpuPaging.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPaging.c
index bcb942a8e5..c7e0822452 100644
--- a/UefiCpuPkg/CpuMpPei/CpuPaging.c
+++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c
@@ -554,6 +554,8 @@ SetupStackGuardPage (
   MpInitLibGetNumberOfProcessors(&NumberOfProcessors, 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) {
@@ -570,6 +572,7 @@ SetupStackGuardPage (
       //
       MpInitLibStartupThisAP(GetStackBase, Index, NULL, 0, (VOID *)&StackBase, NULL);
     }
+    ASSERT (StackBase != 0);
     //
     // Set Guard page at stack base address.
     //
-- 
2.16.2.windows.1

Re: [PATCH v2] UefiCpuPkg/CpuMpPei: fix vs2012 build error

[Laszlo Ersek]

On 09/18/18 11:04, Jian J Wang wrote:
>> v2 changes:
>>   Incorpate Laszlo's reivew comments
>>   a. change title
>>   b. drop unrelated changes
>>   c. remove error message
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1166
> 
> Visual Studio 2012 will complain uninitialized variable, StackBase,
> in the CpuPaging.c. This patch adds code to init it to zero and
> ASSERT check against 0. This is enough since uninit case will only
> happen during retrieving stack memory via gEfiHobMemoryAllocStackGuid.
> But this HOB will always be created in advance.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
> ---
>  UefiCpuPkg/CpuMpPei/CpuPaging.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPaging.c
> index bcb942a8e5..c7e0822452 100644
> --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c
> @@ -554,6 +554,8 @@ SetupStackGuardPage (
>    MpInitLibGetNumberOfProcessors(&NumberOfProcessors, 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) {
> @@ -570,6 +572,7 @@ SetupStackGuardPage (
>        //
>        MpInitLibStartupThisAP(GetStackBase, Index, NULL, 0, (VOID *)&StackBase, NULL);
>      }
> +    ASSERT (StackBase != 0);
>      //
>      // Set Guard page at stack base address.
>      //
> 

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

Thanks!
Laszlo

Re: [PATCH v2] UefiCpuPkg/CpuMpPei: fix vs2012 build error

[Dong, Eric]

Reviewed-by: Eric Dong <eric.dong@intel.com>

> -----Original Message-----
> From: Wang, Jian J
> Sent: Tuesday, September 18, 2018 5:05 PM
> To: edk2-devel@lists.01.org
> Cc: Bi, Dandan <dandan.bi@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
> Dong, Eric <eric.dong@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: [PATCH v2] UefiCpuPkg/CpuMpPei: fix vs2012 build error
> 
> > v2 changes:
> >   Incorpate Laszlo's reivew comments
> >   a. change title
> >   b. drop unrelated changes
> >   c. remove error message
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1166
> 
> Visual Studio 2012 will complain uninitialized variable, StackBase, in the
> CpuPaging.c. This patch adds code to init it to zero and ASSERT check against 0.
> This is enough since uninit case will only happen during retrieving stack
> memory via gEfiHobMemoryAllocStackGuid.
> But this HOB will always be created in advance.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
> ---
>  UefiCpuPkg/CpuMpPei/CpuPaging.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> b/UefiCpuPkg/CpuMpPei/CpuPaging.c index bcb942a8e5..c7e0822452
> 100644
> --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c
> @@ -554,6 +554,8 @@ SetupStackGuardPage (
>    MpInitLibGetNumberOfProcessors(&NumberOfProcessors, 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) { @@ -570,6 +572,7 @@ SetupStackGuardPage (
>        //
>        MpInitLibStartupThisAP(GetStackBase, Index, NULL, 0, (VOID
> *)&StackBase, NULL);
>      }
> +    ASSERT (StackBase != 0);
>      //
>      // Set Guard page at stack base address.
>      //
> --
> 2.16.2.windows.1