intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: mem alloc size tracking safety

Browse Source 
Make sure local mem alloc size atomic array is initialized with 0.
Add debug breaks to catch possible overflow on unregistering
allocations.

Related-To: NEO-11356

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek
2024-08-05 10:26:23 +00:00
committed by Compute-Runtime-Automation
parent a1a13475c7
commit e9e6cc05e3
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/source/memory_manager/memory_manager.cpp
View File

@@ -78,6 +78,7 @@ MemoryManager::MemoryManager(ExecutionEnvironment &executionEnvironment) : execu
auto globalHeap = ApiSpecificConfig::getGlobalBindlessHeapConfiguration(rootDeviceEnvironment.getReleaseHelper());
heapAssigners.push_back(std::make_unique<HeapAssigner>(globalHeap));
localMemAllocsSize[rootDeviceIndex].store(0u);
}
if (anyLocalMemorySupported) {

2
shared/source/os_interface/linux/drm_memory_manager.cpp
View File

@@ -1569,8 +1569,10 @@ AllocationStatus DrmMemoryManager::registerLocalMemAlloc(GraphicsAllocation *all
void DrmMemoryManager::unregisterAllocation(GraphicsAllocation *allocation) {
if (allocation->isAllocatedInLocalMemoryPool()) {
DEBUG_BREAK_IF(allocation->getUnderlyingBufferSize() > localMemAllocsSize[allocation->getRootDeviceIndex()]);
localMemAllocsSize[allocation->getRootDeviceIndex()] -= allocation->getUnderlyingBufferSize();
} else if (MemoryPool::memoryNull != allocation->getMemoryPool()) {
DEBUG_BREAK_IF(allocation->getUnderlyingBufferSize() > sysMemAllocsSize);
sysMemAllocsSize -= allocation->getUnderlyingBufferSize();
}
std::lock_guard<std::mutex> lock(this->allocMutex);

2
shared/source/os_interface/windows/wddm_memory_manager.cpp
View File

@@ -787,8 +787,10 @@ void WddmMemoryManager::freeGraphicsMemoryImpl(GraphicsAllocation *gfxAllocation
}
if (gfxAllocation->isAllocatedInLocalMemoryPool()) {
DEBUG_BREAK_IF(gfxAllocation->getUnderlyingBufferSize() > localMemAllocsSize[gfxAllocation->getRootDeviceIndex()]);
localMemAllocsSize[gfxAllocation->getRootDeviceIndex()] -= gfxAllocation->getUnderlyingBufferSize();
} else if (MemoryPool::memoryNull != gfxAllocation->getMemoryPool()) {
DEBUG_BREAK_IF(gfxAllocation->getUnderlyingBufferSize() > sysMemAllocsSize);
sysMemAllocsSize -= gfxAllocation->getUnderlyingBufferSize();
}