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

UefiCpuPkg: Enhance logic in InitializeMpExceptionStackSwitchHandlers

Browse Source 
Parallelly run the function to SeparateExceptionStacks for all CPUs and
allocate buffers together for better performance.

Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
This commit is contained in:
Liu, Zhiguang 2022-08-26 15:39:01 +08:00 committed by mergify[bot]
parent 9ab2b34dd4
commit 4b7bd4c591
2 changed files with 140 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
UefiCpuPkg/CpuDxe/CpuMp.c
View File

@ -601,7 +601,8 @@ CollectBistDataFromHob (
// //
typedef struct { typedef struct {
VOID *Buffer; VOID *Buffer;
UINTN *BufferSize; UINTN BufferSize;
EFI_STATUS Status;
} EXCEPTION_STACK_SWITCH_CONTEXT; } EXCEPTION_STACK_SWITCH_CONTEXT;
/** /**
@ -620,9 +621,18 @@ 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);
}
} }
/** /**
@ -638,53 +648,69 @@ InitializeMpExceptionStackSwitchHandlers (
) )
{ {
UINTN Index; UINTN Index;
UINTN Bsp; EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData;
EXCEPTION_STACK_SWITCH_CONTEXT SwitchStackData;
UINTN BufferSize; UINTN BufferSize;
EFI_STATUS Status;
UINT8 *Buffer;
SwitchStackData.BufferSize = &BufferSize; SwitchStackData = AllocateZeroPool (mNumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT));
MpInitLibWhoAmI (&Bsp); ASSERT (SwitchStackData != NULL);
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 (Index == Bsp) { if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) {
InitializeExceptionStackSwitchHandlers (&SwitchStackData); ASSERT (SwitchStackData[Index].BufferSize != 0);
BufferSize += SwitchStackData[Index].BufferSize;
} else { } else {
// ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS);
// AP might need different buffer size from BSP. ASSERT (SwitchStackData[Index].BufferSize == 0);
// }
MpInitLibStartupThisAP (InitializeExceptionStackSwitchHandlers, Index, NULL, 0, (VOID *)&SwitchStackData, NULL);
} }
if (BufferSize == 0) { if (BufferSize != 0) {
continue; Buffer = AllocateRuntimeZeroPool (BufferSize);
} ASSERT (Buffer != NULL);
BufferSize = 0;
SwitchStackData.Buffer = AllocateRuntimeZeroPool (BufferSize); for (Index = 0; Index < mNumberOfProcessors; ++Index) {
ASSERT (SwitchStackData.Buffer != NULL); if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) {
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%x\n", "Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%lX\n",
(UINT64)(UINTN)Index, (UINT64)(UINTN)Index,
(UINT64)(UINTN)SwitchStackData.Buffer, (UINT64)(UINTN)SwitchStackData[Index].Buffer,
(UINT32)BufferSize (UINT64)(UINTN)SwitchStackData[Index].BufferSize
)); ));
}
}
if (Index == Bsp) { Status = MpInitLibStartupAllCPUs (
InitializeExceptionStackSwitchHandlers (&SwitchStackData);
} else {
MpInitLibStartupThisAP (
InitializeExceptionStackSwitchHandlers, InitializeExceptionStackSwitchHandlers,
Index,
NULL,
0, 0,
(VOID *)&SwitchStackData, 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,7 +416,8 @@ PeiWhoAmI (
// //
typedef struct { typedef struct {
VOID *Buffer; VOID *Buffer;
UINTN *BufferSize; UINTN BufferSize;
EFI_STATUS Status;
} EXCEPTION_STACK_SWITCH_CONTEXT; } EXCEPTION_STACK_SWITCH_CONTEXT;
/** /**
@ -435,9 +436,18 @@ 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);
}
} }
/** /**
@ -453,60 +463,76 @@ InitializeMpExceptionStackSwitchHandlers (
) )
{ {
UINTN Index; UINTN Index;
UINTN Bsp;
EXCEPTION_STACK_SWITCH_CONTEXT SwitchStackData;
UINTN BufferSize;
UINTN NumberOfProcessors; UINTN NumberOfProcessors;
EXCEPTION_STACK_SWITCH_CONTEXT *SwitchStackData;
UINTN BufferSize;
EFI_STATUS Status;
UINT8 *Buffer;
if (!PcdGetBool (PcdCpuStackGuard)) { if (!PcdGetBool (PcdCpuStackGuard)) {
return; return;
} }
SwitchStackData.BufferSize = &BufferSize;
MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL);
MpInitLibWhoAmI (&Bsp); SwitchStackData = AllocatePages (EFI_SIZE_TO_PAGES (NumberOfProcessors * sizeof (EXCEPTION_STACK_SWITCH_CONTEXT)));
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 (Index == Bsp) { if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) {
InitializeExceptionStackSwitchHandlers (&SwitchStackData); ASSERT (SwitchStackData[Index].BufferSize != 0);
BufferSize += SwitchStackData[Index].BufferSize;
} else { } else {
// ASSERT (SwitchStackData[Index].Status == EFI_SUCCESS);
// AP might need different buffer size from BSP. ASSERT (SwitchStackData[Index].BufferSize == 0);
// }
MpInitLibStartupThisAP (InitializeExceptionStackSwitchHandlers, Index, NULL, 0, (VOID *)&SwitchStackData, NULL);
} }
if (BufferSize == 0) { if (BufferSize != 0) {
continue; Buffer = AllocatePages (EFI_SIZE_TO_PAGES (BufferSize));
} ASSERT (Buffer != NULL);
BufferSize = 0;
SwitchStackData.Buffer = AllocatePages (EFI_SIZE_TO_PAGES (BufferSize)); for (Index = 0; Index < NumberOfProcessors; ++Index) {
ASSERT (SwitchStackData.Buffer != NULL); if (SwitchStackData[Index].Status == EFI_BUFFER_TOO_SMALL) {
ZeroMem (SwitchStackData.Buffer, EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BufferSize))); 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%x\n", "Buffer[cpu%lu] for InitializeExceptionStackSwitchHandlers: 0x%lX with size 0x%lX\n",
(UINT64)(UINTN)Index, (UINT64)(UINTN)Index,
(UINT64)(UINTN)SwitchStackData.Buffer, (UINT64)(UINTN)SwitchStackData[Index].Buffer,
(UINT32)BufferSize (UINT64)(UINTN)SwitchStackData[Index].BufferSize
)); ));
}
}
if (Index == Bsp) { Status = MpInitLibStartupAllCPUs (
InitializeExceptionStackSwitchHandlers (&SwitchStackData);
} else {
MpInitLibStartupThisAP (
InitializeExceptionStackSwitchHandlers, InitializeExceptionStackSwitchHandlers,
Index,
NULL,
0, 0,
(VOID *)&SwitchStackData, 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)));
} }
/** /**