i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: Fix stack corruption in cache topology detection

Browse Source
This commit is contained in:
Pawel Dziepak
2013-12-30 06:10:14 +01:00
parent 8aa1539bb0
commit 046af755d0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_cpu.cpp
+14 -12
View File
@@ -15,6 +15,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <algorithm>
#include <ACPI.h> #include <ACPI.h>
#include <boot_device.h> #include <boot_device.h>
@@ -578,7 +580,7 @@ detect_amd_cache_topology(uint32 maxExtendedLeaf)
return; return;
uint8 hierarchyLevels[CPU_MAX_CACHE_LEVEL]; uint8 hierarchyLevels[CPU_MAX_CACHE_LEVEL];
uint8 maxCacheLevel = 0; int maxCacheLevel = 0;
int currentLevel = 0; int currentLevel = 0;
int cacheType; int cacheType;
@@ -587,17 +589,17 @@ detect_amd_cache_topology(uint32 maxExtendedLeaf)
get_current_cpuid(&cpuid, 0x8000001d, currentLevel); get_current_cpuid(&cpuid, 0x8000001d, currentLevel);
cacheType = cpuid.regs.eax & 0x1f; cacheType = cpuid.regs.eax & 0x1f;
int cacheLevel = (cpuid.regs.eax >> 5) & 0x7; if (cacheType == 0)
break;
int cacheLevel = (cpuid.regs.eax >> 5) & 0x7;
int coresCount = next_power_of_2(((cpuid.regs.eax >> 14) & 0x3f) + 1); int coresCount = next_power_of_2(((cpuid.regs.eax >> 14) & 0x3f) + 1);
hierarchyLevels[cacheLevel - 1] hierarchyLevels[cacheLevel - 1]
= coresCount * (sHierarchyMask[CPU_TOPOLOGY_SMT] + 1); = coresCount * (sHierarchyMask[CPU_TOPOLOGY_SMT] + 1);
maxCacheLevel = std::max(maxCacheLevel, cacheLevel);
if (cacheType != 0)
maxCacheLevel = max_c(maxCacheLevel, cacheLevel);
currentLevel++; currentLevel++;
} while (cacheType != 0); } while (true);
for (int i = 0; i < maxCacheLevel; i++) for (int i = 0; i < maxCacheLevel; i++)
sCacheSharingMask[i] = ~uint32(hierarchyLevels[i] - 1); sCacheSharingMask[i] = ~uint32(hierarchyLevels[i] - 1);
@@ -692,7 +694,7 @@ detect_intel_cache_topology(uint32 maxBasicLeaf)
return; return;
uint8 hierarchyLevels[CPU_MAX_CACHE_LEVEL]; uint8 hierarchyLevels[CPU_MAX_CACHE_LEVEL];
uint8 maxCacheLevel = 0; int maxCacheLevel = 0;
int currentLevel = 0; int currentLevel = 0;
int cacheType; int cacheType;
@@ -701,16 +703,16 @@ detect_intel_cache_topology(uint32 maxBasicLeaf)
get_current_cpuid(&cpuid, 4, currentLevel); get_current_cpuid(&cpuid, 4, currentLevel);
cacheType = cpuid.regs.eax & 0x1f; cacheType = cpuid.regs.eax & 0x1f;
int cacheLevel = (cpuid.regs.eax >> 5) & 0x7; if (cacheType == 0)
break;
int cacheLevel = (cpuid.regs.eax >> 5) & 0x7;
hierarchyLevels[cacheLevel - 1] hierarchyLevels[cacheLevel - 1]
= next_power_of_2(((cpuid.regs.eax >> 14) & 0x3f) + 1); = next_power_of_2(((cpuid.regs.eax >> 14) & 0x3f) + 1);
maxCacheLevel = std::max(maxCacheLevel, cacheLevel);
if (cacheType != 0)
maxCacheLevel = max_c(maxCacheLevel, cacheLevel);
currentLevel++; currentLevel++;
} while (cacheType != 0); } while (true);
for (int i = 0; i < maxCacheLevel; i++) for (int i = 0; i < maxCacheLevel; i++)
sCacheSharingMask[i] = ~uint32(hierarchyLevels[i] - 1); sCacheSharingMask[i] = ~uint32(hierarchyLevels[i] - 1);