From: "Wang, Jian J" <jian.j.wang@intel.com>
To: "Yao, Jiewen" <jiewen.yao@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>,
"Dong, Eric" <eric.dong@intel.com>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] UefiCpuPkg/MpInitLib: fix wrong base address set as Stack Guard
Date: Wed, 3 Jan 2018 07:05:36 +0000 [thread overview]
Message-ID: <D827630B58408649ACB04F44C510003624CC95B7@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20171229083631.16652-1-jian.j.wang@intel.com>
Jiewen,
Please take a look at this patch.
Regards,
Jian
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Jian J
> Wang
> Sent: Friday, December 29, 2017 4:37 PM
> To: edk2-devel@lists.01.org
> Cc: Laszlo Ersek <lersek@redhat.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Dong, Eric <eric.dong@intel.com>
> Subject: [edk2] [PATCH] UefiCpuPkg/MpInitLib: fix wrong base address set as
> Stack Guard
>
> The reason is that DXE part initialization will reuse the stack allocated
> at PEI phase, if MP was initialized before. Some code added to check this
> situation and use stack base address saved in HOB passed from PEI.
>
> Cc: Jiewen Yao <jiewen.yao@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/Library/MpInitLib/DxeMpLib.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
> b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
> index 40c1bf407a..05484c9ff3 100644
> --- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
> +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
> @@ -295,6 +295,7 @@ InitMpGlobalData (
> UINTN Index;
> EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;
> UINTN StackBase;
> + CPU_INFO_IN_HOB *CpuInfoInHob;
>
> SaveCpuMpData (CpuMpData);
>
> @@ -314,9 +315,18 @@ InitMpGlobalData (
> ASSERT (FALSE);
> }
>
> - for (Index = 0; Index < CpuMpData->CpuCount; ++Index) {
> - StackBase = CpuMpData->Buffer + Index * CpuMpData->CpuApStackSize;
> + //
> + // DXE will reuse stack allocated for APs at PEI phase if it's available.
> + // Let's check it here.
> + //
> + CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;
> + if (CpuInfoInHob != NULL && CpuInfoInHob->ApTopOfStack != 0) {
> + StackBase = CpuInfoInHob->ApTopOfStack;
> + } else {
> + StackBase = CpuMpData->Buffer;
> + }
>
> + for (Index = 0; Index < CpuMpData->CpuCount; ++Index) {
> Status = gDS->GetMemorySpaceDescriptor (StackBase, &MemDesc);
> ASSERT_EFI_ERROR (Status);
>
> @@ -326,6 +336,9 @@ InitMpGlobalData (
> MemDesc.Attributes | EFI_MEMORY_RP
> );
> ASSERT_EFI_ERROR (Status);
> +
> + DEBUG ((DEBUG_VERBOSE, "Stack Guard set at %x [cpu%d]!\n", StackBase,
> Index));
> + StackBase += CpuMpData->CpuApStackSize;
> }
> }
>
> --
> 2.15.1.windows.2
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2018-01-03 7:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 8:36 [PATCH] UefiCpuPkg/MpInitLib: fix wrong base address set as Stack Guard Jian J Wang
2018-01-03 7:05 ` Wang, Jian J [this message]
2018-01-03 17:33 ` Laszlo Ersek
2018-01-04 0:41 ` Wang, Jian J
2018-01-04 1:09 ` Wang, Jian J
2018-01-04 1:45 ` Wang, Jian J
2018-01-04 12:21 ` Laszlo Ersek
2018-01-05 0:52 ` Wang, Jian J
2018-01-05 1:40 ` 答复: " Fan Jeff
2018-01-05 1:57 ` Wang, Jian J
2018-01-05 2:48 ` 答复: " Fan Jeff
2018-01-05 2:49 ` Fan Jeff
2018-01-05 2:54 ` Chaganty, Rangasai V
2018-01-05 2:56 ` Wang, Jian J
2018-01-05 2:55 ` Wang, Jian J
2018-01-05 2:57 ` Yao, Jiewen
2018-01-05 3:04 ` 答复: " Fan Jeff
2018-01-05 3:06 ` Wang, Jian J
2018-01-04 12:18 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D827630B58408649ACB04F44C510003624CC95B7@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox