diff options
author | Oliver Smith-Denny <osde@microsoft.com> | 2024-12-13 13:04:04 -0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-12-17 10:55:59 +0000 |
commit | 924780f2ccb5d4bed09d7b79a85817f15906a608 (patch) | |
tree | d4566ebcb44c77b4509e561beceb736ed813743a | |
parent | cef65b2e9382ed4de698d03310bfefe48b374d14 (diff) | |
download | edk2-924780f2ccb5d4bed09d7b79a85817f15906a608.tar.gz |
UefiCpuPkg: x86 CpuDxe: Allocate AP Exception Stack Below 4GB
When setting up the APs' exception stacks, the x86 CpuDxe allocates
any range and then copies over the existing GDT and IDT and adds the
appropriate new entries for this AP, then installs them.
This can cause an issue if the allocated buffer is over 4GB because
the next time the AP is started, it goes through an INIT-SIPI-SIPI,
stepping through real mode -> protected mode -> long mode and when it
is in protected mode it needs a 32 code segment descriptor or else it
will fault when trying to execute. If the GDT lives above 4GB, it
cannot be accessed by the protected mode code and the triple fault
is seen.
This patch updates CpuDxe's MP management code to allocate the
exception stacks for all APs below 4GB explicitly to avoid this
problem, such as it does with the BSP's GDT that first gets
populated to the APs.
Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
-rw-r--r-- | UefiCpuPkg/CpuDxe/CpuMp.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c index b90312e863..b5478ff7c4 100644 --- a/UefiCpuPkg/CpuDxe/CpuMp.c +++ b/UefiCpuPkg/CpuDxe/CpuMp.c @@ -661,7 +661,12 @@ InitializeMpExceptionStackSwitchHandlers ( UINT8 *Buffer;
SwitchStackData = AllocateZeroPool (mNumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT));
- ASSERT (SwitchStackData != NULL);
+ if (SwitchStackData == NULL) {
+ DEBUG ((DEBUG_ERROR, "%a Failed to allocate buffer for SwitchStackData\n", __func__));
+ ASSERT (SwitchStackData != NULL);
+ return;
+ }
+
for (Index = 0; Index < mNumberOfProcessors; ++Index) {
//
// Because the procedure may runs multiple times, use the status EFI_NOT_STARTED
@@ -689,8 +694,24 @@ InitializeMpExceptionStackSwitchHandlers ( }
if (BufferSize != 0) {
- Buffer = AllocateRuntimeZeroPool (BufferSize);
- ASSERT (Buffer != NULL);
+ // we are allocating the buffer that will hold the new GDT and IDT for the APs. These must be allocated below
+ // 4GB as they are used by protected mode code on the APs when they are started up after this point. If they are
+ // above 4GB, the APs will triple fault because the 32 bit code segment is invalid
+ Buffer = (UINT8 *)(UINTN)(BASE_4GB - 1);
+ Status = gBS->AllocatePages (
+ AllocateMaxAddress,
+ EfiRuntimeServicesData,
+ EFI_SIZE_TO_PAGES (BufferSize),
+ (EFI_PHYSICAL_ADDRESS *)&Buffer
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Failed to allocate buffer for InitializeExceptionStackSwitchHandlers Status %r\n", Status));
+ ASSERT_EFI_ERROR (Status);
+ goto Exit;
+ }
+
+ ZeroMem (Buffer, BufferSize);
+
BufferSize = 0;
for (Index = 0; Index < mNumberOfProcessors; ++Index) {
if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) {
@@ -717,6 +738,7 @@ InitializeMpExceptionStackSwitchHandlers ( }
}
+Exit:
FreePool (SwitchStackData);
}
|