tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: Using CPU semaphores in aligned buffer 

Update each CPU semaphores to the ones in allocated aligned
semaphores buffer.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Jeff Fan 2016-03-22 10:21:27 +08:00 committed by Michael Kinney
parent 4e92058113
commit ed3d5ecb34
3 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
View File

@ -123,7 +123,7 @@ WaitForAllAPs (
BspIndex = mSmmMpSyncData->BspIndex; BspIndex = mSmmMpSyncData->BspIndex;
while (NumberOfAPs-- > 0) { while (NumberOfAPs-- > 0) {
WaitForSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
} }
} }
@ -142,8 +142,8 @@ ReleaseAllAPs (
BspIndex = mSmmMpSyncData->BspIndex; BspIndex = mSmmMpSyncData->BspIndex;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = mMaxNumberOfCpus; Index-- > 0;) {
if (Index != BspIndex && mSmmMpSyncData->CpuData[Index].Present) { if (Index != BspIndex && *(mSmmMpSyncData->CpuData[Index].Present)) {
ReleaseSemaphore (&mSmmMpSyncData->CpuData[Index].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[Index].Run);
} }
} }
} }
@ -175,7 +175,7 @@ AllCpusInSmmWithExceptions (
CpuData = mSmmMpSyncData->CpuData; CpuData = mSmmMpSyncData->CpuData;
ProcessorInfo = gSmmCpuPrivate->ProcessorInfo; ProcessorInfo = gSmmCpuPrivate->ProcessorInfo;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = mMaxNumberOfCpus; Index-- > 0;) {
if (!CpuData[Index].Present && ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) { if (!(*(CpuData[Index].Present)) && ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) {
if (((Exceptions & ARRIVAL_EXCEPTION_DELAYED) != 0) && SmmCpuFeaturesGetSmmRegister (Index, SmmRegSmmDelayed) != 0) { if (((Exceptions & ARRIVAL_EXCEPTION_DELAYED) != 0) && SmmCpuFeaturesGetSmmRegister (Index, SmmRegSmmDelayed) != 0) {
continue; continue;
} }
@ -251,7 +251,7 @@ SmmWaitForApArrival (
// Send SMI IPIs to bring outside processors in // Send SMI IPIs to bring outside processors in
// //
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = mMaxNumberOfCpus; Index-- > 0;) {
if (!mSmmMpSyncData->CpuData[Index].Present && gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) { if (!(*(mSmmMpSyncData->CpuData[Index].Present)) && gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) {
SendSmiIpi ((UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId); SendSmiIpi ((UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId);
} }
} }
@ -333,7 +333,7 @@ BSPHandler (
// //
// Mark this processor's presence // Mark this processor's presence
// //
mSmmMpSyncData->CpuData[CpuIndex].Present = TRUE; *(mSmmMpSyncData->CpuData[CpuIndex].Present) = TRUE;
// //
// Clear platform top level SMI status bit before calling SMI handlers. If // Clear platform top level SMI status bit before calling SMI handlers. If
@ -412,7 +412,7 @@ BSPHandler (
// //
// The BUSY lock is initialized to Acquired state // The BUSY lock is initialized to Acquired state
// //
AcquireSpinLockOrFail (&mSmmMpSyncData->CpuData[CpuIndex].Busy); AcquireSpinLockOrFail (mSmmMpSyncData->CpuData[CpuIndex].Busy);
// //
// Perform the pre tasks // Perform the pre tasks
@ -428,9 +428,9 @@ BSPHandler (
// Make sure all APs have completed their pending none-block tasks // Make sure all APs have completed their pending none-block tasks
// //
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = mMaxNumberOfCpus; Index-- > 0;) {
if (Index != CpuIndex && mSmmMpSyncData->CpuData[Index].Present) { if (Index != CpuIndex && *(mSmmMpSyncData->CpuData[Index].Present)) {
AcquireSpinLock (&mSmmMpSyncData->CpuData[Index].Busy); AcquireSpinLock (mSmmMpSyncData->CpuData[Index].Busy);
ReleaseSpinLock (&mSmmMpSyncData->CpuData[Index].Busy);; ReleaseSpinLock (mSmmMpSyncData->CpuData[Index].Busy);
} }
} }
@ -457,7 +457,7 @@ BSPHandler (
while (TRUE) { while (TRUE) {
PresentCount = 0; PresentCount = 0;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = mMaxNumberOfCpus; Index-- > 0;) {
if (mSmmMpSyncData->CpuData[Index].Present) { if (*(mSmmMpSyncData->CpuData[Index].Present)) {
PresentCount ++; PresentCount ++;
} }
} }
@ -515,7 +515,7 @@ BSPHandler (
// //
// Clear the Present flag of BSP // Clear the Present flag of BSP
// //
mSmmMpSyncData->CpuData[CpuIndex].Present = FALSE; *(mSmmMpSyncData->CpuData[CpuIndex].Present) = FALSE;
// //
// Gather APs to exit SMM synchronously. Note the Present flag is cleared by now but // Gather APs to exit SMM synchronously. Note the Present flag is cleared by now but
@ -617,20 +617,20 @@ APHandler (
// //
// Mark this processor's presence // Mark this processor's presence
// //
mSmmMpSyncData->CpuData[CpuIndex].Present = TRUE; *(mSmmMpSyncData->CpuData[CpuIndex].Present) = TRUE;
if (SyncMode == SmmCpuSyncModeTradition || SmmCpuFeaturesNeedConfigureMtrrs()) { if (SyncMode == SmmCpuSyncModeTradition || SmmCpuFeaturesNeedConfigureMtrrs()) {
// //
// Notify BSP of arrival at this point // Notify BSP of arrival at this point
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
} }
if (SmmCpuFeaturesNeedConfigureMtrrs()) { if (SmmCpuFeaturesNeedConfigureMtrrs()) {
// //
// Wait for the signal from BSP to backup MTRRs // Wait for the signal from BSP to backup MTRRs
// //
WaitForSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
// //
// Backup OS MTRRs // Backup OS MTRRs
@ -640,12 +640,12 @@ APHandler (
// //
// Signal BSP the completion of this AP // Signal BSP the completion of this AP
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
// //
// Wait for BSP's signal to program MTRRs // Wait for BSP's signal to program MTRRs
// //
WaitForSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
// //
// Replace OS MTRRs with SMI MTRRs // Replace OS MTRRs with SMI MTRRs
@ -655,14 +655,14 @@ APHandler (
// //
// Signal BSP the completion of this AP // Signal BSP the completion of this AP
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
} }
while (TRUE) { while (TRUE) {
// //
// Wait for something to happen // Wait for something to happen
// //
WaitForSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
// //
// Check if BSP wants to exit SMM // Check if BSP wants to exit SMM
@ -675,7 +675,7 @@ APHandler (
// BUSY should be acquired by SmmStartupThisAp() // BUSY should be acquired by SmmStartupThisAp()
// //
ASSERT ( ASSERT (
!AcquireSpinLockOrFail (&mSmmMpSyncData->CpuData[CpuIndex].Busy) !AcquireSpinLockOrFail (mSmmMpSyncData->CpuData[CpuIndex].Busy)
); );
// //
@ -688,19 +688,19 @@ APHandler (
// //
// Release BUSY // Release BUSY
// //
ReleaseSpinLock (&mSmmMpSyncData->CpuData[CpuIndex].Busy); ReleaseSpinLock (mSmmMpSyncData->CpuData[CpuIndex].Busy);
} }
if (SmmCpuFeaturesNeedConfigureMtrrs()) { if (SmmCpuFeaturesNeedConfigureMtrrs()) {
// //
// Notify BSP the readiness of this AP to program MTRRs // Notify BSP the readiness of this AP to program MTRRs
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
// //
// Wait for the signal from BSP to program MTRRs // Wait for the signal from BSP to program MTRRs
// //
WaitForSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
// //
// Restore OS MTRRs // Restore OS MTRRs
@ -712,22 +712,22 @@ APHandler (
// //
// Notify BSP the readiness of this AP to Reset states/semaphore for this processor // Notify BSP the readiness of this AP to Reset states/semaphore for this processor
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
// //
// Wait for the signal from BSP to Reset states/semaphore for this processor // Wait for the signal from BSP to Reset states/semaphore for this processor
// //
WaitForSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); WaitForSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
// //
// Reset states/semaphore for this processor // Reset states/semaphore for this processor
// //
mSmmMpSyncData->CpuData[CpuIndex].Present = FALSE; *(mSmmMpSyncData->CpuData[CpuIndex].Present) = FALSE;
// //
// Notify BSP the readiness of this AP to exit SMM // Notify BSP the readiness of this AP to exit SMM
// //
ReleaseSemaphore (&mSmmMpSyncData->CpuData[BspIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[BspIndex].Run);
} }
@ -928,19 +928,19 @@ SmmStartupThisAp (
{ {
if (CpuIndex >= gSmmCpuPrivate->SmmCoreEntryContext.NumberOfCpus || if (CpuIndex >= gSmmCpuPrivate->SmmCoreEntryContext.NumberOfCpus ||
CpuIndex == gSmmCpuPrivate->SmmCoreEntryContext.CurrentlyExecutingCpu || CpuIndex == gSmmCpuPrivate->SmmCoreEntryContext.CurrentlyExecutingCpu ||
!mSmmMpSyncData->CpuData[CpuIndex].Present || !(*(mSmmMpSyncData->CpuData[CpuIndex].Present)) ||
gSmmCpuPrivate->Operation[CpuIndex] == SmmCpuRemove || gSmmCpuPrivate->Operation[CpuIndex] == SmmCpuRemove ||
!AcquireSpinLockOrFail (&mSmmMpSyncData->CpuData[CpuIndex].Busy)) { !AcquireSpinLockOrFail (mSmmMpSyncData->CpuData[CpuIndex].Busy)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
mSmmMpSyncData->CpuData[CpuIndex].Procedure = Procedure; mSmmMpSyncData->CpuData[CpuIndex].Procedure = Procedure;
mSmmMpSyncData->CpuData[CpuIndex].Parameter = ProcArguments; mSmmMpSyncData->CpuData[CpuIndex].Parameter = ProcArguments;
ReleaseSemaphore (&mSmmMpSyncData->CpuData[CpuIndex].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[CpuIndex].Run);
if (FeaturePcdGet (PcdCpuSmmBlockStartupThisAp)) { if (FeaturePcdGet (PcdCpuSmmBlockStartupThisAp)) {
AcquireSpinLock (&mSmmMpSyncData->CpuData[CpuIndex].Busy); AcquireSpinLock (mSmmMpSyncData->CpuData[CpuIndex].Busy);
ReleaseSpinLock (&mSmmMpSyncData->CpuData[CpuIndex].Busy); ReleaseSpinLock (mSmmMpSyncData->CpuData[CpuIndex].Busy);
} }
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -1079,7 +1079,7 @@ SmiRendezvous (
// E.g., with Relaxed AP flow, SmmStartupThisAp() may be called immediately // E.g., with Relaxed AP flow, SmmStartupThisAp() may be called immediately
// after AP's present flag is detected. // after AP's present flag is detected.
// //
InitializeSpinLock (&mSmmMpSyncData->CpuData[CpuIndex].Busy); InitializeSpinLock (mSmmMpSyncData->CpuData[CpuIndex].Busy);
} }
// //
@ -1169,7 +1169,7 @@ SmiRendezvous (
} }
} }
ASSERT (mSmmMpSyncData->CpuData[CpuIndex].Run == 0); ASSERT (*mSmmMpSyncData->CpuData[CpuIndex].Run == 0);
// //
// Wait for BSP's signal to exit SMI // Wait for BSP's signal to exit SMI
@ -1205,6 +1205,7 @@ InitializeSmmCpuSemaphores (
VOID VOID
) )
{ {
UINTN CpuIndex;
UINTN ProcessorCount; UINTN ProcessorCount;
UINTN TotalSize; UINTN TotalSize;
UINTN GlobalSemaphoresSize; UINTN GlobalSemaphoresSize;
@ -1251,6 +1252,15 @@ InitializeSmmCpuSemaphores (
mPFLock = mSmmCpuSemaphores.SemaphoreGlobal.PFLock; mPFLock = mSmmCpuSemaphores.SemaphoreGlobal.PFLock;
mConfigSmmCodeAccessCheckLock = mSmmCpuSemaphores.SemaphoreGlobal.CodeAccessCheckLock; mConfigSmmCodeAccessCheckLock = mSmmCpuSemaphores.SemaphoreGlobal.CodeAccessCheckLock;
for (CpuIndex = 0; CpuIndex < ProcessorCount; CpuIndex ++) {
mSmmMpSyncData->CpuData[CpuIndex].Busy =
(SPIN_LOCK *)((UINTN)mSmmCpuSemaphores.SemaphoreCpu.Busy + SemaphoreSize * CpuIndex);
mSmmMpSyncData->CpuData[CpuIndex].Run =
(UINT32 *)((UINTN)mSmmCpuSemaphores.SemaphoreCpu.Run + SemaphoreSize * CpuIndex);
mSmmMpSyncData->CpuData[CpuIndex].Present =
(BOOLEAN *)((UINTN)mSmmCpuSemaphores.SemaphoreCpu.Present + SemaphoreSize * CpuIndex);
}
mSemaphoreSize = SemaphoreSize; mSemaphoreSize = SemaphoreSize;
} }

4
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
View File

@ -246,7 +246,7 @@ SmmReadSaveState (
// the pseudo register value for EFI_SMM_SAVE_STATE_REGISTER_PROCESSOR_ID is returned in Buffer. // the pseudo register value for EFI_SMM_SAVE_STATE_REGISTER_PROCESSOR_ID is returned in Buffer.
// Otherwise, EFI_NOT_FOUND is returned. // Otherwise, EFI_NOT_FOUND is returned.
// //
if (mSmmMpSyncData->CpuData[CpuIndex].Present) { if (*(mSmmMpSyncData->CpuData[CpuIndex].Present)) {
*(UINT64 *)Buffer = gSmmCpuPrivate->ProcessorInfo[CpuIndex].ProcessorId; *(UINT64 *)Buffer = gSmmCpuPrivate->ProcessorInfo[CpuIndex].ProcessorId;
return EFI_SUCCESS; return EFI_SUCCESS;
} else { } else {
@ -254,7 +254,7 @@ SmmReadSaveState (
} }
} }
if (!mSmmMpSyncData->CpuData[CpuIndex].Present) { if (!(*(mSmmMpSyncData->CpuData[CpuIndex].Present))) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }

6
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
View File

@ -295,11 +295,11 @@ SmmRelocationSemaphoreComplete (
/// The type of SMM CPU Information /// The type of SMM CPU Information
/// ///
typedef struct { typedef struct {
SPIN_LOCK Busy; SPIN_LOCK *Busy;
volatile EFI_AP_PROCEDURE Procedure; volatile EFI_AP_PROCEDURE Procedure;
volatile VOID *Parameter; volatile VOID *Parameter;
volatile UINT32 Run; volatile UINT32 *Run;
volatile BOOLEAN Present; volatile BOOLEAN *Present;
} SMM_CPU_DATA_BLOCK; } SMM_CPU_DATA_BLOCK;
typedef enum { typedef enum {