fix: Avoiding races when modifying queue and Tag data

andrzejkoska · Compute-Runtime-Automation · commit ac71eb763b92 · 2023-10-25T16:31:59.000+02:00
Related-To: NEO-8196 Signed-off-by: Andrzej Koska <andrzej.koska@intel.com> Source: c4a24d8
diff --git a/opencl/source/command_queue/command_queue_hw_base.inl b/opencl/source/command_queue/command_queue_hw_base.inl
@@ -172,6 +172,7 @@ bool CommandQueueHw<Family>::waitForTimestamps(Range<CopyEngineState> copyEngine
     bool waited = false;
 
     if (isWaitForTimestampsEnabled()) {
+        TakeOwnershipWrapper<CommandQueue> queueOwnership(*this);
         waited = waitForTimestampsWithinContainer<TSPacketType>(mainContainer, getGpgpuCommandStreamReceiver(), status);
 
         if (waited) {
diff --git a/shared/source/utilities/tag_allocator.inl b/shared/source/utilities/tag_allocator.inl
@@ -15,6 +15,7 @@ template <typename TagType>
 TagAllocator<TagType>::TagAllocator(const RootDeviceIndicesContainer &rootDeviceIndices, MemoryManager *memMngr, size_t tagCount, size_t tagAlignment,
                                     size_t tagSize, bool doNotReleaseNodes, DeviceBitfield deviceBitfield)
     : TagAllocatorBase(rootDeviceIndices, memMngr, tagCount, tagAlignment, tagSize, doNotReleaseNodes, deviceBitfield) {
+    std::unique_lock<std::mutex> lock(allocatorMutex);
 
     populateFreeTags();
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ template <typename TagType>`
`15`	`15`	`TagAllocator<TagType>::TagAllocator(const RootDeviceIndicesContainer &rootDeviceIndices, MemoryManager *memMngr, size_t tagCount, size_t tagAlignment,`
`16`	`16`	`size_t tagSize, bool doNotReleaseNodes, DeviceBitfield deviceBitfield)`
`17`	`17`	`: TagAllocatorBase(rootDeviceIndices, memMngr, tagCount, tagAlignment, tagSize, doNotReleaseNodes, deviceBitfield) {`
	`18`	`+ std::unique_lock<std::mutex> lock(allocatorMutex);`
`18`	`19`
`19`	`20`	`populateFreeTags();`
`20`	`21`	`}`