In current implementation, core level semaphore use same container
with package level semaphore. This design will let the core level
semaphore not works as expected in below case:
1. Feature A has CPU_FEATURE_CORE_BEFORE dependence with Feature B.
2. Feature C has CPU_FEATURE_PACKAGE_AFTER dependence with Feature B.
in this case an core level semaphore will be add between A and B, and
an package level semaphore will be add between B and C.
For a CPU has one package, two cores and 4 threads. Execute like below:
Thread 1 Thread 2 ..... Thread 4
ReleaseSemaph(1,2) -|
WaitForSemaph(1(2)) -|<-----------------------These two are Core Semaph
ReleaseSemaph(1,2) -|
WaitForSemaph(2) -| <--- Core Semaph
ReleaseSemaph (1,2,3,4) -|
WaitForSemaph (1(4)) -| <---------------- Package Semaph
ReleaseSemaph(3,4)
WaitForSemaph(4(2)) <- Core Semaph
In above case, for thread 4, when it executes a core semaphore, i will
found WaitForSemaph(4(2)) is met because Thread 1 has execute a package
semaphore and ReleaseSemaph(4) for it before. This is not an expect
behavior. Thread 4 should wait for thread 3 to do this.
Fix this issue by separate the semaphore container for core level and
package level.
Cc: Laszlo Ersek <ler...@redhat.com>
Cc: Ruiyu Ni <ruiyu...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.d...@intel.com>
---
.../Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 9 ++++++---
UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h | 7 ++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 7f208dbe6a..4bed0ce3a4 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -269,8 +269,10 @@ CpuInitDataInitialize (
DEBUG ((DEBUG_INFO, "Package: %d, Valid Core : %d\n", Index,
ValidCoreCountPerPackage[Index]));
}
- CpuFeaturesData->CpuFlags.SemaphoreCount = AllocateZeroPool (sizeof (UINT32)
* CpuStatus->PackageCount * CpuStatus->MaxCoreCount *
CpuStatus->MaxThreadCount);
- ASSERT (CpuFeaturesData->CpuFlags.SemaphoreCount != NULL);
+ CpuFeaturesData->CpuFlags.CoreSemaphoreCount = AllocateZeroPool (sizeof
(UINT32) * CpuStatus->PackageCount * CpuStatus->MaxCoreCount *
CpuStatus->MaxThreadCount);
+ ASSERT (CpuFeaturesData->CpuFlags.CoreSemaphoreCount != NULL);
+ CpuFeaturesData->CpuFlags.PackageSemaphoreCount = AllocateZeroPool (sizeof
(UINT32) * CpuStatus->PackageCount * CpuStatus->MaxCoreCount *
CpuStatus->MaxThreadCount);
+ ASSERT (CpuFeaturesData->CpuFlags.PackageSemaphoreCount != NULL);
//
// Get support and configuration PCDs
@@ -933,9 +935,9 @@ ProgramProcessorRegister (
// V(0...n) V(0...n) ... V(0...n)
// n * P(0) n * P(1) ... n * P(n)
//
- SemaphorePtr = CpuFlags->SemaphoreCount;
switch (RegisterTableEntry->Value) {
case CoreDepType:
+ SemaphorePtr = CpuFlags->CoreSemaphoreCount;
//
// Get Offset info for the first thread in the core which current
thread belongs to.
//
@@ -956,6 +958,7 @@ ProgramProcessorRegister (
break;
case PackageDepType:
+ SemaphorePtr = CpuFlags->PackageSemaphoreCount;
ValidCoreCountPerPackage = (UINT32
*)(UINTN)CpuStatus->ValidCoreCountPerPackage;
//
// Get Offset info for the first thread in the package which current
thread belongs to.
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
index b4c8ab777e..4898a80827 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
@@ -60,9 +60,10 @@ typedef struct {
// Flags used when program the register.
//
typedef struct {
- volatile UINTN ConsoleLogLock; // Spinlock used to control
console.
- volatile UINTN MemoryMappedLock; // Spinlock used to program
mmio
- volatile UINT32 *SemaphoreCount; // Semaphore used to program
semaphore.
+ volatile UINTN ConsoleLogLock; // Spinlock used to
control console.
+ volatile UINTN MemoryMappedLock; // Spinlock used to
program mmio
+ volatile UINT32 *CoreSemaphoreCount; // Semaphore containers
used to program Core semaphore.
+ volatile UINT32 *PackageSemaphoreCount; // Semaphore containers
used to program Package semaphore.
} PROGRAM_CPU_REGISTER_FLAGS;
typedef struct {
--
2.15.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
