Skip to content

Commit e6f9868

Browse files
committed
[DevMSAN] Alway reserve origin memory for GPU device
1 parent 57fb0b8 commit e6f9868

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,19 +323,21 @@ ur_result_t MsanShadowMemoryGPU::EnqueuePoisonShadowWithOrigin(
323323
Events.data(), OutEvent));
324324
}
325325

326-
if (Origin) {
326+
{
327327
uptr OriginBegin = MemToOrigin(Ptr);
328328
uptr OriginEnd = MemToOrigin(Ptr + Size - 1) + sizeof(Origin) - 1;
329329
UR_CALL(EnqueueVirtualMemMap(OriginBegin, OriginEnd, Events, OutEvent));
330330

331-
UR_LOG_L(getContext()->logger, DEBUG,
332-
"EnqueuePoisonOrigin(addr={}, size={}, value={})",
333-
(void *)OriginBegin, OriginEnd - OriginBegin + 1,
334-
(void *)(uptr)Origin);
331+
if (Origin) {
332+
UR_LOG_L(getContext()->logger, DEBUG,
333+
"EnqueuePoisonOrigin(addr={}, size={}, value={})",
334+
(void *)OriginBegin, OriginEnd - OriginBegin + 1,
335+
(void *)(uptr)Origin);
335336

336-
UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMFill(
337-
Queue, (void *)OriginBegin, sizeof(Origin), &Origin,
338-
OriginEnd - OriginBegin + 1, NumEvents, EventWaitList, OutEvent));
337+
UR_CALL(getContext()->urDdiTable.Enqueue.pfnUSMFill(
338+
Queue, (void *)OriginBegin, sizeof(Origin), &Origin,
339+
OriginEnd - OriginBegin + 1, NumEvents, EventWaitList, OutEvent));
340+
}
339341
}
340342

341343
return UR_RESULT_SUCCESS;

0 commit comments

Comments
 (0)