[DevSanitizer] Fix event and usm leak in sanitizer layer (#18194)

zhaomaosu · KornevNikita · commit a9c68925c8ab · 2025-05-27T10:53:30.000+02:00
* Release local &amp; private shadow memory
* Release events after call urEnqueueEventsWait

---------

Signed-off-by: Zhao, Maosu &lt;maosu.zhao@intel.com&gt;
diff --git a/unified-runtime/source/loader/layers/sanitizer/asan/asan_buffer.cpp b/unified-runtime/source/loader/layers/sanitizer/asan/asan_buffer.cpp
@@ -66,6 +66,9 @@ ur_result_t EnqueueMemCopyRectHelper(
   UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(Queue, Events.size(),
                                                          Events.data(), Event));
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_buffer.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_buffer.cpp
@@ -106,6 +106,9 @@ ur_result_t EnqueueMemCopyRectHelper(
                                                            &Events[0], Event));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_ddi.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_ddi.cpp
@@ -812,6 +812,9 @@ ur_result_t urEnqueueMemBufferWrite(
       UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
           hQueue, Events.size(), Events.data(), phEvent));
     }
+
+    for (const auto &E : Events)
+      UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
   } else {
     UR_CALL(pfnMemBufferWrite(hQueue, hBuffer, blockingWrite, offset, size,
                               pSrc, numEventsInWaitList, phEventWaitList,
@@ -1010,6 +1013,9 @@ ur_result_t urEnqueueMemBufferCopy(
       UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
           hQueue, Events.size(), Events.data(), phEvent));
     }
+
+    for (const auto &E : Events)
+      UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
   } else {
     UR_CALL(pfnMemBufferCopy(hQueue, hBufferSrc, hBufferDst, srcOffset,
                              dstOffset, size, numEventsInWaitList,
@@ -1140,6 +1146,9 @@ ur_result_t urEnqueueMemBufferFill(
       UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
           hQueue, Events.size(), Events.data(), phEvent));
     }
+
+    for (const auto &E : Events)
+      UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
   } else {
     UR_CALL(pfnMemBufferFill(hQueue, hBuffer, pPattern, patternSize, offset,
                              size, numEventsInWaitList, phEventWaitList,
@@ -1468,6 +1477,9 @@ ur_result_t UR_APICALL urEnqueueUSMFill(
         hQueue, Events.size(), Events.data(), phEvent));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
@@ -1539,6 +1551,9 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy(
         hQueue, Events.size(), Events.data(), phEvent));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
@@ -1602,6 +1617,9 @@ ur_result_t UR_APICALL urEnqueueUSMFill2D(
         hQueue, Events.size(), Events.data(), phEvent));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
@@ -1684,6 +1702,9 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy2D(
         hQueue, Events.size(), Events.data(), phEvent));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp
@@ -166,6 +166,16 @@ ur_result_t MsanShadowMemoryGPU::Destory() {
   static ur_result_t Result = [this]() {
     auto Result = getContext()->urDdiTable.VirtualMem.pfnFree(
         Context, (const void *)ShadowBegin, GetShadowSize());
+    if (PrivateShadowOffset != 0) {
+      UR_CALL(getContext()->urDdiTable.USM.pfnFree(
+          Context, (void *)PrivateShadowOffset));
+      PrivateShadowOffset = 0;
+    }
+    if (LocalShadowOffset != 0) {
+      UR_CALL(getContext()->urDdiTable.USM.pfnFree(Context,
+                                                   (void *)LocalShadowOffset));
+      LocalShadowOffset = 0;
+    }
     getContext()->urDdiTable.Context.pfnRelease(Context);
     return Result;
   }();
diff --git a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_buffer.cpp b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_buffer.cpp
@@ -74,6 +74,9 @@ ur_result_t EnqueueMemCopyRectHelper(
                                                            &Events[0], Event));
   }
 
+  for (const auto &E : Events)
+    UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));
+
   return UR_RESULT_SUCCESS;
 }
 
diff --git a/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp b/unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp
@@ -467,18 +467,10 @@ ur_result_t urEnqueueMemBufferWrite(
   if (auto MemBuffer = getTsanInterceptor()->getMemBuffer(hBuffer)) {
     ur_device_handle_t Device = GetDevice(hQueue);
     char *pDst = nullptr;
-    std::vector<ur_event_handle_t> Events;
-    ur_event_handle_t Event{};
     UR_CALL(MemBuffer->getHandle(Device, pDst));
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMMemcpy(
         hQueue, blockingWrite, pDst + offset, pSrc, size, numEventsInWaitList,
-        phEventWaitList, &Event));
-    Events.push_back(Event);
-
-    if (phEvent) {
-      UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
-          hQueue, Events.size(), Events.data(), phEvent));
-    }
+        phEventWaitList, phEvent));
   } else {
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnMemBufferWrite(
         hQueue, hBuffer, blockingWrite, offset, size, pSrc, numEventsInWaitList,
@@ -647,17 +639,9 @@ ur_result_t urEnqueueMemBufferCopy(
     char *DstHandle = nullptr;
     UR_CALL(DstBuffer->getHandle(Device, DstHandle));
 
-    std::vector<ur_event_handle_t> Events;
-    ur_event_handle_t Event{};
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMMemcpy(
         hQueue, false, DstHandle + dstOffset, SrcHandle + srcOffset, size,
-        numEventsInWaitList, phEventWaitList, &Event));
-    Events.push_back(Event);
-
-    if (phEvent) {
-      UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
-          hQueue, Events.size(), Events.data(), phEvent));
-    }
+        numEventsInWaitList, phEventWaitList, phEvent));
   } else {
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnMemBufferCopy(
         hQueue, hBufferSrc, hBufferDst, srcOffset, dstOffset, size,
@@ -759,19 +743,11 @@ ur_result_t urEnqueueMemBufferFill(
 
   if (auto MemBuffer = getTsanInterceptor()->getMemBuffer(hBuffer)) {
     char *Handle = nullptr;
-    std::vector<ur_event_handle_t> Events;
-    ur_event_handle_t Event{};
     ur_device_handle_t Device = GetDevice(hQueue);
     UR_CALL(MemBuffer->getHandle(Device, Handle));
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMFill(
         hQueue, Handle + offset, patternSize, pPattern, size,
-        numEventsInWaitList, phEventWaitList, &Event));
-    Events.push_back(Event);
-
-    if (phEvent) {
-      UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(
-          hQueue, Events.size(), Events.data(), phEvent));
-    }
+        numEventsInWaitList, phEventWaitList, phEvent));
   } else {
     UR_CALL(getContext()->urDdiTable.Enqueue.pfnMemBufferFill(
         hQueue, hBuffer, pPattern, patternSize, offset, size,

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ ur_result_t EnqueueMemCopyRectHelper(`
`66`	`66`	`UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(Queue, Events.size(),`
`67`	`67`	`Events.data(), Event));`
`68`	`68`
	`69`	`+ for (const auto &E : Events)`
	`70`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`71`	`+`
`69`	`72`	`return UR_RESULT_SUCCESS;`
`70`	`73`	`}`
`71`	`74`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ ur_result_t EnqueueMemCopyRectHelper(`
`106`	`106`	`&Events[0], Event));`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ for (const auto &E : Events)`
	`110`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`111`	`+`
`109`	`112`	`return UR_RESULT_SUCCESS;`
`110`	`113`	`}`
`111`	`114`
Original file line number	Diff line number	Diff line change
`@@ -812,6 +812,9 @@ ur_result_t urEnqueueMemBufferWrite(`
`812`	`812`	`UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(`
`813`	`813`	`hQueue, Events.size(), Events.data(), phEvent));`
`814`	`814`	`}`
	`815`	`+`
	`816`	`+ for (const auto &E : Events)`
	`817`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
`815`	`818`	`} else {`
`816`	`819`	`UR_CALL(pfnMemBufferWrite(hQueue, hBuffer, blockingWrite, offset, size,`
`817`	`820`	`pSrc, numEventsInWaitList, phEventWaitList,`
`@@ -1010,6 +1013,9 @@ ur_result_t urEnqueueMemBufferCopy(`
`1010`	`1013`	`UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(`
`1011`	`1014`	`hQueue, Events.size(), Events.data(), phEvent));`
`1012`	`1015`	`}`
	`1016`	`+`
	`1017`	`+ for (const auto &E : Events)`
	`1018`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
`1013`	`1019`	`} else {`
`1014`	`1020`	`UR_CALL(pfnMemBufferCopy(hQueue, hBufferSrc, hBufferDst, srcOffset,`
`1015`	`1021`	`dstOffset, size, numEventsInWaitList,`
`@@ -1140,6 +1146,9 @@ ur_result_t urEnqueueMemBufferFill(`
`1140`	`1146`	`UR_CALL(getContext()->urDdiTable.Enqueue.pfnEventsWait(`
`1141`	`1147`	`hQueue, Events.size(), Events.data(), phEvent));`
`1142`	`1148`	`}`
	`1149`	`+`
	`1150`	`+ for (const auto &E : Events)`
	`1151`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
`1143`	`1152`	`} else {`
`1144`	`1153`	`UR_CALL(pfnMemBufferFill(hQueue, hBuffer, pPattern, patternSize, offset,`
`1145`	`1154`	`size, numEventsInWaitList, phEventWaitList,`
`@@ -1468,6 +1477,9 @@ ur_result_t UR_APICALL urEnqueueUSMFill(`
`1468`	`1477`	`hQueue, Events.size(), Events.data(), phEvent));`
`1469`	`1478`	`}`
`1470`	`1479`
	`1480`	`+ for (const auto &E : Events)`
	`1481`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`1482`	`+`
`1471`	`1483`	`return UR_RESULT_SUCCESS;`
`1472`	`1484`	`}`
`1473`	`1485`
`@@ -1539,6 +1551,9 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy(`
`1539`	`1551`	`hQueue, Events.size(), Events.data(), phEvent));`
`1540`	`1552`	`}`
`1541`	`1553`
	`1554`	`+ for (const auto &E : Events)`
	`1555`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`1556`	`+`
`1542`	`1557`	`return UR_RESULT_SUCCESS;`
`1543`	`1558`	`}`
`1544`	`1559`
`@@ -1602,6 +1617,9 @@ ur_result_t UR_APICALL urEnqueueUSMFill2D(`
`1602`	`1617`	`hQueue, Events.size(), Events.data(), phEvent));`
`1603`	`1618`	`}`
`1604`	`1619`
	`1620`	`+ for (const auto &E : Events)`
	`1621`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`1622`	`+`
`1605`	`1623`	`return UR_RESULT_SUCCESS;`
`1606`	`1624`	`}`
`1607`	`1625`
`@@ -1684,6 +1702,9 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy2D(`
`1684`	`1702`	`hQueue, Events.size(), Events.data(), phEvent));`
`1685`	`1703`	`}`
`1686`	`1704`
	`1705`	`+ for (const auto &E : Events)`
	`1706`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`1707`	`+`
`1687`	`1708`	`return UR_RESULT_SUCCESS;`
`1688`	`1709`	`}`
`1689`	`1710`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ ur_result_t EnqueueMemCopyRectHelper(`
`74`	`74`	`&Events[0], Event));`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ for (const auto &E : Events)`
	`78`	`+ UR_CALL(getContext()->urDdiTable.Event.pfnRelease(E));`
	`79`	`+`
`77`	`80`	`return UR_RESULT_SUCCESS;`
`78`	`81`	`}`
`79`	`82`