Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f6085
[DevSanitizer] Fix event and usm leak in sanitizer layer
zhaomaosu Apr 25, 2025
143e6e6
use const
zhaomaosu Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions unified-runtime/source/loader/layers/sanitizer/asan/asan_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 3 additions & 0 deletions unified-runtime/source/loader/layers/sanitizer/msan/msan_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
21 changes: 21 additions & 0 deletions unified-runtime/source/loader/layers/sanitizer/msan/msan_ddi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,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,
Expand Down Expand Up @@ -1029,6 +1032,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,
Expand Down Expand Up @@ -1159,6 +1165,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,
Expand Down Expand Up @@ -1487,6 +1496,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;
}

Expand Down Expand Up @@ -1558,6 +1570,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;
}

Expand Down Expand Up @@ -1621,6 +1636,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;
}

Expand Down Expand Up @@ -1703,6 +1721,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;
}

Expand Down
10 changes: 10 additions & 0 deletions unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}();
Expand Down
3 changes: 3 additions & 0 deletions unified-runtime/source/loader/layers/sanitizer/tsan/tsan_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
30 changes: 3 additions & 27 deletions unified-runtime/source/loader/layers/sanitizer/tsan/tsan_ddi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,18 +484,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,
Expand Down Expand Up @@ -664,17 +656,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,
Expand Down Expand Up @@ -776,19 +760,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,
Expand Down