Revision: 16369
http://sourceforge.net/p/edk2/code/16369
Author: jljusten
Date: 2014-11-13 18:29:54 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
UefiCpuPkg/MpService: avoid dead lock caused by CheckAllAPsStatus
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen Fan <[email protected]>
Reviewed-by: Jeff Fan <[email protected]>
Modified Paths:
--------------
trunk/edk2/UefiCpuPkg/CpuDxe/CpuMp.c
Modified: trunk/edk2/UefiCpuPkg/CpuDxe/CpuMp.c
===================================================================
--- trunk/edk2/UefiCpuPkg/CpuDxe/CpuMp.c 2014-11-13 18:29:40 UTC (rev
16368)
+++ trunk/edk2/UefiCpuPkg/CpuDxe/CpuMp.c 2014-11-13 18:29:54 UTC (rev
16369)
@@ -632,6 +632,11 @@
return EFI_INVALID_PARAMETER;
}
+ //
+ // temporarily stop checkAllAPsStatus for avoid resource dead-lock.
+ //
+ mStopCheckAllAPsStatus = TRUE;
+
for (Number = 0; Number < mMpSystemData.NumberOfProcessors; Number++) {
CpuData = &mMpSystemData.CpuDatas[Number];
if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) {
@@ -653,11 +658,6 @@
}
}
- //
- // temporarily stop checkAllAPsStatus for initialize parameters.
- //
- mStopCheckAllAPsStatus = TRUE;
-
mMpSystemData.Procedure = Procedure;
mMpSystemData.ProcedureArgument = ProcedureArgument;
mMpSystemData.WaitEvent = WaitEvent;
@@ -716,6 +716,11 @@
return EFI_SUCCESS;
}
+ //
+ // Blocking temporarily stop CheckAllAPsStatus()
+ //
+ mStopCheckAllAPsStatus = TRUE;
+
while (TRUE) {
CheckAndUpdateAllAPsToIdleState ();
if (mMpSystemData.FinishCount == mMpSystemData.StartCount) {
@@ -859,6 +864,11 @@
return EFI_NOT_FOUND;
}
+ //
+ // temporarily stop checkAllAPsStatus for avoid resource dead-lock.
+ //
+ mStopCheckAllAPsStatus = TRUE;
+
CpuData = &mMpSystemData.CpuDatas[ProcessorNumber];
if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT) ||
!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) {
@@ -869,11 +879,6 @@
return EFI_NOT_READY;
}
- //
- // temporarily stop checkAllAPsStatus for initialize parameters.
- //
- mStopCheckAllAPsStatus = TRUE;
-
SetApState (CpuData, CpuStateReady);
SetApProcedure (CpuData, Procedure, ProcedureArgument);
@@ -1013,7 +1018,11 @@
)
{
CPU_DATA_BLOCK *CpuData;
+ BOOLEAN TempStopCheckState;
+ CpuData = NULL;
+ TempStopCheckState = FALSE;
+
if (!IsBSP ()) {
return EFI_DEVICE_ERROR;
}
@@ -1022,6 +1031,14 @@
return EFI_NOT_FOUND;
}
+ //
+ // temporarily stop checkAllAPsStatus for initialize parameters.
+ //
+ if (!mStopCheckAllAPsStatus) {
+ mStopCheckAllAPsStatus = TRUE;
+ TempStopCheckState = TRUE;
+ }
+
CpuData = &mMpSystemData.CpuDatas[ProcessorNumber];
if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) {
return EFI_INVALID_PARAMETER;
@@ -1048,6 +1065,10 @@
CpuStatusFlagOr (CpuData, (*HealthFlag & PROCESSOR_HEALTH_STATUS_BIT));
}
+ if (TempStopCheckState) {
+ mStopCheckAllAPsStatus = FALSE;
+ }
+
return EFI_SUCCESS;
}
@@ -1303,20 +1324,6 @@
//
for (Number = 0; Number < mMpSystemData.NumberOfProcessors; Number++) {
CpuData = &mMpSystemData.CpuDatas[Number];
- if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) {
- //
- // Skip BSP
- //
- continue;
- }
-
- if (!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) {
- //
- // Skip Disabled processors
- //
- continue;
- }
-
if (CpuData->WaitEvent) {
CheckThisAPStatus (NULL, (VOID *)CpuData);
}
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
