tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-24 10:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UefiCpuPkg: Enhance logic in InitializeMpExceptionStackSwitchHandlers"

Browse Source 
This reverts commit 4b7bd4c591a81a290b31e9d1a94c4b8be787989e, because it
breaks IA32 targets, at least for XCODE5, CLANGPDB and CLANGDWARF
toolchains

Signed-off-by: Savva Mitrofanov <savvamtr@gmail.com>
This commit is contained in:
Savva Mitrofanov 2022-12-08 21:06:02 +06:00 committed by Mikhail Krichanov
parent 98937be856
commit d0b4d95eff
2 changed files with 88 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
UefiCpuPkg/CpuDxe/CpuMp.c
View File

@ -601,8 +601,7 @@ CollectBistDataFromHob (
// //
typedef struct { typedef struct {
VOID *Buffer; VOID *Buffer;
UINTN BufferSize; UINTN *BufferSize;
EFI_STATUS Status;
} EXCEPTION_STACK_SWITCH_CONTEXT; } EXCEPTION_STACK_SWITCH_CONTEXT;
/** /**
@ -621,18 +620,9 @@ InitializeExceptionStackSwitchHandlers (
) )
{ {
EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData; EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData;
UINTN Index;
MpInitLibWhoAmI (&Index);
SwitchStackData = (EXCEPTION_STACK_SWITCH_CONTEXT *)Buffer; SwitchStackData = (EXCEPTION_STACK_SWITCH_CONTEXT *)Buffer;
InitializeSeparateExceptionStacks (SwitchStackData->Buffer, SwitchStackData->BufferSize);
//
// This may be called twice for each Cpu. Only run InitializeSeparateExceptionStacks
// if this is the first call or the first call failed because of size too small.
//
if ((SwitchStackData[Index].Status == EFI_NOT_STARTED) || (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL)) {
SwitchStackData[Index].Status = InitializeSeparateExceptionStacks (SwitchStackData[Index].Buffer, &SwitchStackData[Index].BufferSize);
}
} }
/** /**
@ -648,69 +638,53 @@ InitializeMpExceptionStackSwitchHandlers (
) )
{ {
UINTN Index; UINTN Index;
EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData; UINTN Bsp;
EXCEPTION_STACK_SWITCH_CONTEXT SwitchStackData;
UINTN BufferSize; UINTN BufferSize;
EFI_STATUS Status;
UINT8 *Buffer;
SwitchStackData = AllocateZeroPool (mNumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT)); SwitchStackData.BufferSize = &BufferSize;
ASSERT (SwitchStackData != NULL); MpInitLibWhoAmI (&Bsp);
for (Index = 0; Index < mNumberOfProcessors; ++Index) { for (Index = 0; Index < mNumberOfProcessors; ++Index) {
// SwitchStackData.Buffer = NULL;
// Because the procedure may runs multiple times, use the status EFI_NOT_STARTED
// to indicate the procedure haven't been run yet.
//
SwitchStackData[Index].Status = EFI_NOT_STARTED;
}
Status = MpInitLibStartupAllCPUs (
InitializeExceptionStackSwitchHandlers,
0,
SwitchStackData
);
ASSERT_EFI_ERROR (Status);
BufferSize = 0; BufferSize = 0;
for (Index = 0; Index < mNumberOfProcessors; ++Index) {
if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) { if (Index == Bsp) {
ASSERT (SwitchStackData[Index].BufferSize != 0); InitializeExceptionStackSwitchHandlers (&SwitchStackData);
BufferSize += SwitchStackData[Index].BufferSize;
} else { } else {
ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS); //
ASSERT (SwitchStackData[Index].BufferSize == 0); // AP might need different buffer size from BSP.
} //
MpInitLibStartupThisAP (InitializeExceptionStackSwitchHandlers, Index, NULL, 0, (VOID *)&SwitchStackData, NULL);
} }
if (BufferSize != 0) { if (BufferSize == 0) {
Buffer = AllocateRuntimeZeroPool (BufferSize); continue;
ASSERT (Buffer != NULL); }
BufferSize = 0;
for (Index = 0; Index < mNumberOfProcessors; ++Index) { SwitchStackData.Buffer = AllocateRuntimeZeroPool (BufferSize);
if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) { ASSERT (SwitchStackData.Buffer != NULL);
SwitchStackData[Index].Buffer = (VOID *)(&Buffer[BufferSize]);
BufferSize += SwitchStackData[Index].BufferSize;
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%lX\n", "Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%x\n",
(UINT64)(UINTN)Index, (UINT64)(UINTN)Index,
(UINT64)(UINTN)SwitchStackData[Index].Buffer, (UINT64)(UINTN)SwitchStackData.Buffer,
(UINT64)(UINTN)SwitchStackData[Index].BufferSize (UINT32)BufferSize
)); ));
}
}
Status = MpInitLibStartupAllCPUs ( if (Index == Bsp) {
InitializeExceptionStackSwitchHandlers (&SwitchStackData);
} else {
MpInitLibStartupThisAP (
InitializeExceptionStackSwitchHandlers, InitializeExceptionStackSwitchHandlers,
Index,
NULL,
0, 0,
SwitchStackData (VOID *)&SwitchStackData,
NULL
); );
ASSERT_EFI_ERROR (Status);
for (Index = 0; Index < mNumberOfProcessors; ++Index) {
ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS);
} }
} }
FreePool (SwitchStackData);
} }
/** /**

94
UefiCpuPkg/CpuMpPei/CpuMpPei.c
View File

@ -416,8 +416,7 @@ PeiWhoAmI (
// //
typedef struct { typedef struct {
VOID *Buffer; VOID *Buffer;
UINTN BufferSize; UINTN *BufferSize;
EFI_STATUS Status;
} EXCEPTION_STACK_SWITCH_CONTEXT; } EXCEPTION_STACK_SWITCH_CONTEXT;
/** /**
@ -436,18 +435,9 @@ InitializeExceptionStackSwitchHandlers (
) )
{ {
EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData; EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData;
UINTN Index;
MpInitLibWhoAmI (&Index);
SwitchStackData = (EXCEPTION_STACK_SWITCH_CONTEXT *)Buffer; SwitchStackData = (EXCEPTION_STACK_SWITCH_CONTEXT *)Buffer;
InitializeSeparateExceptionStacks (SwitchStackData->Buffer, SwitchStackData->BufferSize);
//
// This function may be called twice for each Cpu. Only run InitializeSeparateExceptionStacks
// if this is the first call or the first call failed because of size too small.
//
if ((SwitchStackData[Index].Status == EFI_NOT_STARTED) || (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL)) {
SwitchStackData[Index].Status = InitializeSeparateExceptionStacks (SwitchStackData[Index].Buffer, &SwitchStackData[Index].BufferSize);
}
} }
/** /**
@ -463,76 +453,60 @@ InitializeMpExceptionStackSwitchHandlers (
) )
{ {
UINTN Index; UINTN Index;
UINTN NumberOfProcessors; UINTN Bsp;
EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData; EXCEPTION_STACK_SWITCH_CONTEXT SwitchStackData;
UINTN BufferSize; UINTN BufferSize;
EFI_STATUS Status; UINTN NumberOfProcessors;
UINT8 *Buffer;
if (!PcdGetBool (PcdCpuStackGuard)) { if (!PcdGetBool (PcdCpuStackGuard)) {
return; return;
} }
SwitchStackData.BufferSize = &BufferSize;
MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL);
SwitchStackData = AllocatePages (EFI_SIZE_TO_PAGES (NumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT))); MpInitLibWhoAmI (&Bsp);
ASSERT (SwitchStackData != NULL);
ZeroMem (SwitchStackData, NumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT));
for (Index = 0; Index < NumberOfProcessors; ++Index) { for (Index = 0; Index < NumberOfProcessors; ++Index) {
// SwitchStackData.Buffer = NULL;
// Because the procedure may runs multiple times, use the status EFI_NOT_STARTED
// to indicate the procedure haven't been run yet.
//
SwitchStackData[Index].Status = EFI_NOT_STARTED;
}
Status = MpInitLibStartupAllCPUs (
InitializeExceptionStackSwitchHandlers,
0,
SwitchStackData
);
ASSERT_EFI_ERROR (Status);
BufferSize = 0; BufferSize = 0;
for (Index = 0; Index < NumberOfProcessors; ++Index) {
if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) { if (Index == Bsp) {
ASSERT (SwitchStackData[Index].BufferSize != 0); InitializeExceptionStackSwitchHandlers (&SwitchStackData);
BufferSize += SwitchStackData[Index].BufferSize;
} else { } else {
ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS); //
ASSERT (SwitchStackData[Index].BufferSize == 0); // AP might need different buffer size from BSP.
} //
MpInitLibStartupThisAP (InitializeExceptionStackSwitchHandlers, Index, NULL, 0, (VOID *)&SwitchStackData, NULL);
} }
if (BufferSize != 0) { if (BufferSize == 0) {
Buffer = AllocatePages (EFI_SIZE_TO_PAGES (BufferSize)); continue;
ASSERT (Buffer != NULL); }
BufferSize = 0;
for (Index = 0; Index < NumberOfProcessors; ++Index) { SwitchStackData.Buffer = AllocatePages (EFI_SIZE_TO_PAGES (BufferSize));
if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) { ASSERT (SwitchStackData.Buffer != NULL);
SwitchStackData[Index].Buffer = (VOID *)(&Buffer[BufferSize]); ZeroMem (SwitchStackData.Buffer, EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BufferSize)));
BufferSize += SwitchStackData[Index].BufferSize;
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%lX\n", "Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%x\n",
(UINT64)(UINTN)Index, (UINT64)(UINTN)Index,
(UINT64)(UINTN)SwitchStackData[Index].Buffer, (UINT64)(UINTN)SwitchStackData.Buffer,
(UINT64)(UINTN)SwitchStackData[Index].BufferSize (UINT32)BufferSize
)); ));
}
}
Status = MpInitLibStartupAllCPUs ( if (Index == Bsp) {
InitializeExceptionStackSwitchHandlers (&SwitchStackData);
} else {
MpInitLibStartupThisAP (
InitializeExceptionStackSwitchHandlers, InitializeExceptionStackSwitchHandlers,
Index,
NULL,
0, 0,
SwitchStackData (VOID *)&SwitchStackData,
NULL
); );
ASSERT_EFI_ERROR (Status);
for (Index = 0; Index < NumberOfProcessors; ++Index) {
ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS);
} }
} }
FreePages (SwitchStackData, EFI_SIZE_TO_PAGES (NumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT)));
} }
/** /**