Skip to content

[DeviceAsan] Serval bug fixes #2293

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 5 commits into from
Dec 5, 2024
Merged

[DeviceAsan] Serval bug fixes #2293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69966c7
minor fixes
yingcong-wu Nov 7, 2024
093a95d
Merge remote-tracking branch 'origin/main' into yc-PR/241107-misc-min…
yingcong-wu Nov 27, 2024
6572a04
allow uninserted program
yingcong-wu Nov 27, 2024
8411e2b
update api usage
yingcong-wu Nov 27, 2024
dc971af
Merge branch 'main' into yc-PR/241107-misc-minor-fix
yingcong-wu Dec 4, 2024
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
21 changes: 12 additions & 9 deletions source/loader/layers/sanitizer/asan_interceptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,25 +215,28 @@ ur_result_t SanitizerInterceptor::releaseMemory(ur_context_handle_t Context,
if (ReleaseList.size()) {
std::scoped_lock<ur_shared_mutex> Guard(m_AllocationMapMutex);
for (auto &It : ReleaseList) {
auto ToFreeAllocInfo = It->second;
getContext()->logger.info("Quarantine Free: {}",
(void *)It->second->AllocBegin);
(void *)ToFreeAllocInfo->AllocBegin);

ContextInfo->Stats.UpdateUSMRealFreed(AllocInfo->AllocSize,
AllocInfo->getRedzoneSize());
ContextInfo->Stats.UpdateUSMRealFreed(
ToFreeAllocInfo->AllocSize, ToFreeAllocInfo->getRedzoneSize());

m_AllocationMap.erase(It);
if (AllocInfo->Type == AllocType::HOST_USM) {
if (ToFreeAllocInfo->Type == AllocType::HOST_USM) {
for (auto &Device : ContextInfo->DeviceList) {
UR_CALL(getDeviceInfo(Device)->Shadow->ReleaseShadow(
AllocInfo));
ToFreeAllocInfo));
}
} else {
UR_CALL(getDeviceInfo(AllocInfo->Device)
->Shadow->ReleaseShadow(AllocInfo));
UR_CALL(getDeviceInfo(ToFreeAllocInfo->Device)
->Shadow->ReleaseShadow(ToFreeAllocInfo));
}

UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)(It->second->AllocBegin)));
Context, (void *)(ToFreeAllocInfo->AllocBegin)));

// Erase it at last to avoid use-after-free.
m_AllocationMap.erase(It);
}
}
ContextInfo->Stats.UpdateUSMFreed(AllocInfo->AllocSize);
Expand Down
1 change: 1 addition & 0 deletions source/loader/layers/sanitizer/asan_shadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ ur_result_t ShadowMemoryGPU::ReleaseShadow(std::shared_ptr<AllocInfo> AI) {
getContext()->logger.debug("urVirtualMemUnmap: {} ~ {}",
(void *)MappedPtr,
(void *)(MappedPtr + PageSize - 1));
VirtualMemMaps.erase(MappedPtr);
}
}

Expand Down
2 changes: 2 additions & 0 deletions source/loader/layers/sanitizer/ur_sanddi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ __urdlllocal ur_result_t UR_APICALL urProgramLink(

UR_CALL(pfnProgramLink(hContext, count, phPrograms, pOptions, phProgram));

UR_CALL(getContext()->interceptor->insertProgram(*phProgram));
UR_CALL(getContext()->interceptor->registerProgram(hContext, *phProgram));

return UR_RESULT_SUCCESS;
Expand Down Expand Up @@ -388,6 +389,7 @@ ur_result_t UR_APICALL urProgramLinkExp(
UR_CALL(pfnProgramLinkExp(hContext, numDevices, phDevices, count,
phPrograms, pOptions, phProgram));

UR_CALL(getContext()->interceptor->insertProgram(*phProgram));
UR_CALL(getContext()->interceptor->registerProgram(hContext, *phProgram));

return UR_RESULT_SUCCESS;
Expand Down
Loading