sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UefiCpuPkg/CpuMp: Fix hang when StackGuard is enabled in 16-core cpu

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3167

When StackGuard is enabled, the CpuMp driver allocates
known good stacks for all CPUs for DF# and PF# exceptions.
It uses AllocatePool to do so.

The size needed equals to 64KB
= StackSize (2K) * ExceptionNumber (2) * NumberOfProcessors (16)

However, AllocatePool max allocation size is less than 64K.
To fix the issue, AllocatePages() is used.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
This commit is contained in:
Ray Ni
2021-01-22 10:45:02 +08:00
committed by mergify[bot]
parent 6c5801be6e
commit 3b769c5110
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UefiCpuPkg/CpuMpPei/CpuMpPei.c
View File

@@ -1,7 +1,7 @@
/** @file /** @file
CPU PEI Module installs CPU Multiple Processor PPI. CPU PEI Module installs CPU Multiple Processor PPI.
Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@@ -532,13 +532,9 @@ InitializeMpExceptionStackSwitchHandlers (
ExceptionNumber = FixedPcdGetSize (PcdCpuStackSwitchExceptionList); ExceptionNumber = FixedPcdGetSize (PcdCpuStackSwitchExceptionList);
NewStackSize = FixedPcdGet32 (PcdCpuKnownGoodStackSize) * ExceptionNumber; NewStackSize = FixedPcdGet32 (PcdCpuKnownGoodStackSize) * ExceptionNumber;
Status = PeiServicesAllocatePool ( StackTop = AllocatePages (EFI_SIZE_TO_PAGES (NewStackSize * NumberOfProcessors));
NewStackSize * NumberOfProcessors,
(VOID **)&StackTop
);
ASSERT(StackTop != NULL); ASSERT(StackTop != NULL);
if (EFI_ERROR (Status)) { if (StackTop == NULL) {
ASSERT_EFI_ERROR (Status);
return; return;
} }
StackTop += NewStackSize * NumberOfProcessors; StackTop += NewStackSize * NumberOfProcessors;

3
UefiCpuPkg/CpuMpPei/CpuMpPei.h
View File

@@ -1,7 +1,7 @@
/** @file /** @file
Definitions to install Multiple Processor PPI. Definitions to install Multiple Processor PPI.
Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@@ -27,6 +27,7 @@
#include <Library/CpuExceptionHandlerLib.h> #include <Library/CpuExceptionHandlerLib.h>
#include <Library/MpInitLib.h> #include <Library/MpInitLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
extern EFI_PEI_PPI_DESCRIPTOR mPeiCpuMpPpiDesc; extern EFI_PEI_PPI_DESCRIPTOR mPeiCpuMpPpiDesc;

3
UefiCpuPkg/CpuMpPei/CpuMpPei.inf
View File

@@ -1,7 +1,7 @@
## @file ## @file
# CPU driver installs CPU PI Multi-processor PPI. # CPU driver installs CPU PI Multi-processor PPI.
# #
# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
## ##
@@ -45,6 +45,7 @@
MpInitLib MpInitLib
BaseMemoryLib BaseMemoryLib
CpuLib CpuLib
MemoryAllocationLib
[Guids] [Guids]
gEdkiiMigratedFvInfoGuid ## SOMETIMES_CONSUMES ## HOB gEdkiiMigratedFvInfoGuid ## SOMETIMES_CONSUMES ## HOB