Skip to content
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

WIP #2535

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

WIP #2535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d36d48e
add handle-checker
yingcong-wu Jan 9, 2025
c7ce9ae
move UR_USE to another header
yingcong-wu Jan 9, 2025
3f03d39
add other handle
yingcong-wu Jan 9, 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
2 changes: 2 additions & 0 deletions source/loader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ if(UR_ENABLE_SANITIZER)
${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanddi.cpp
${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanitizer_layer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanitizer_layer.hpp
${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_handle_checker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_handle_checker.hpp
)

if(UR_ENABLE_SYMBOLIZER)
Expand Down
1 change: 1 addition & 0 deletions source/loader/layers/sanitizer/asan/asan_ddi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "asan_options.hpp"
#include "sanitizer_common/sanitizer_stacktrace.hpp"
#include "sanitizer_common/sanitizer_utils.hpp"
#include "ur_handle_checker.hpp"
#include "ur_sanitizer_layer.hpp"

#include <memory>
Expand Down
58 changes: 31 additions & 27 deletions source/loader/layers/sanitizer/asan/asan_shadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ std::shared_ptr<ShadowMemory> GetShadowMemory(ur_context_handle_t Context,
DeviceType Type) {
if (Type == DeviceType::CPU) {
static std::shared_ptr<ShadowMemory> ShadowCPU =
std::make_shared<ShadowMemoryCPU>(Context, Device);
std::make_shared<ShadowMemoryCPU>(UR_USE(Context), Device);
return ShadowCPU;
} else if (Type == DeviceType::GPU_PVC) {
static std::shared_ptr<ShadowMemory> ShadowPVC =
std::make_shared<ShadowMemoryPVC>(Context, Device);
std::make_shared<ShadowMemoryPVC>(UR_USE(Context), Device);
return ShadowPVC;
} else if (Type == DeviceType::GPU_DG2) {
static std::shared_ptr<ShadowMemory> ShadowDG2 =
std::make_shared<ShadowMemoryDG2>(Context, Device);
std::make_shared<ShadowMemoryDG2>(UR_USE(Context), Device);
return ShadowDG2;
} else {
getContext()->logger.error("Unsupport device type");
Expand Down Expand Up @@ -111,7 +111,7 @@ ur_result_t ShadowMemoryGPU::Setup() {
const void *StartAddress = (void *)(0x100'0000'0000'0000ULL);
// TODO: Protect Bad Zone
auto Result = getContext()->urDdiTable.VirtualMem.pfnReserve(
Context, StartAddress, ShadowSize, (void **)&ShadowBegin);
UR_USE(Context), StartAddress, ShadowSize, (void **)&ShadowBegin);
if (Result != UR_RESULT_SUCCESS) {
getContext()->logger.error(
"Shadow memory reserved failed with size {}: {}",
Expand All @@ -120,13 +120,14 @@ ur_result_t ShadowMemoryGPU::Setup() {
}
ShadowEnd = ShadowBegin + ShadowSize;
// Retain the context which reserves shadow memory
getContext()->urDdiTable.Context.pfnRetain(Context);
getContext()->urDdiTable.Context.pfnRetain(UR_USE(Context));

// Set shadow memory for null pointer
// For GPU, wu use up to 1 page of shadow memory
const size_t NullptrRedzoneSize =
GetVirtualMemGranularity(Context, Device) << ASAN_SHADOW_SCALE;
ManagedQueue Queue(Context, Device);
GetVirtualMemGranularity(UR_USE(Context), Device)
<< ASAN_SHADOW_SCALE;
ManagedQueue Queue(UR_USE(Context), Device);
Result = EnqueuePoisonShadow(Queue, 0, NullptrRedzoneSize,
kNullPointerRedzoneMagic);
if (Result != UR_RESULT_SUCCESS) {
Expand All @@ -142,21 +143,22 @@ ur_result_t ShadowMemoryGPU::Setup() {
ur_result_t ShadowMemoryGPU::Destory() {
if (PrivateShadowOffset != 0) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)PrivateShadowOffset));
UR_USE(Context), (void *)PrivateShadowOffset));
PrivateShadowOffset = 0;
}

static ur_result_t Result = [this]() {
const size_t PageSize = GetVirtualMemGranularity(Context, Device);
const size_t PageSize =
GetVirtualMemGranularity(UR_USE(Context), Device);
for (auto [MappedPtr, PhysicalMem] : VirtualMemMaps) {
UR_CALL(getContext()->urDdiTable.VirtualMem.pfnUnmap(
Context, (void *)MappedPtr, PageSize));
UR_USE(Context), (void *)MappedPtr, PageSize));
UR_CALL(
getContext()->urDdiTable.PhysicalMem.pfnRelease(PhysicalMem));
}
UR_CALL(getContext()->urDdiTable.VirtualMem.pfnFree(
Context, (const void *)ShadowBegin, GetShadowSize()));
UR_CALL(getContext()->urDdiTable.Context.pfnRelease(Context));
UR_USE(Context), (const void *)ShadowBegin, GetShadowSize()));
UR_CALL(getContext()->urDdiTable.Context.pfnRelease(UR_USE(Context)));
return UR_RESULT_SUCCESS;
}();
if (!Result) {
Expand All @@ -165,13 +167,13 @@ ur_result_t ShadowMemoryGPU::Destory() {

if (LocalShadowOffset != 0) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)LocalShadowOffset));
UR_USE(Context), (void *)LocalShadowOffset));
LocalShadowOffset = 0;
}
if (ShadowBegin != 0) {
UR_CALL(getContext()->urDdiTable.VirtualMem.pfnFree(
Context, (const void *)ShadowBegin, GetShadowSize()));
UR_CALL(getContext()->urDdiTable.Context.pfnRelease(Context));
UR_USE(Context), (const void *)ShadowBegin, GetShadowSize()));
UR_CALL(getContext()->urDdiTable.Context.pfnRelease(UR_USE(Context)));
ShadowBegin = ShadowEnd = 0;
}
return UR_RESULT_SUCCESS;
Expand All @@ -189,7 +191,7 @@ ur_result_t ShadowMemoryGPU::EnqueuePoisonShadow(ur_queue_handle_t Queue,
assert(ShadowBegin <= ShadowEnd);
{
static const size_t PageSize =
GetVirtualMemGranularity(Context, Device);
GetVirtualMemGranularity(UR_USE(Context), Device);

ur_physical_mem_properties_t Desc{
UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES, nullptr, 0};
Expand All @@ -201,16 +203,16 @@ ur_result_t ShadowMemoryGPU::EnqueuePoisonShadow(ur_queue_handle_t Queue,
if (VirtualMemMaps.find(MappedPtr) == VirtualMemMaps.end()) {
ur_physical_mem_handle_t PhysicalMem{};
auto URes = getContext()->urDdiTable.PhysicalMem.pfnCreate(
Context, Device, PageSize, &Desc, &PhysicalMem);
UR_USE(Context), Device, PageSize, &Desc, &PhysicalMem);
if (URes != UR_RESULT_SUCCESS) {
getContext()->logger.error("urPhysicalMemCreate(): {}",
URes);
return URes;
}

URes = getContext()->urDdiTable.VirtualMem.pfnMap(
Context, (void *)MappedPtr, PageSize, PhysicalMem, 0,
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
UR_USE(Context), (void *)MappedPtr, PageSize, PhysicalMem,
0, UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
if (URes != UR_RESULT_SUCCESS) {
getContext()->logger.error("urVirtualMemMap({}, {}): {}",
(void *)MappedPtr, PageSize,
Expand Down Expand Up @@ -258,25 +260,26 @@ ur_result_t ShadowMemoryGPU::AllocLocalShadow(ur_queue_handle_t Queue,
(NumWG * LocalMemorySize) >> ASAN_SHADOW_SCALE;
static size_t LastAllocedSize = 0;
if (RequiredShadowSize > LastAllocedSize) {
auto ContextInfo = getAsanInterceptor()->getContextInfo(Context);
auto ContextInfo =
getAsanInterceptor()->getContextInfo(UR_USE(Context));
if (LocalShadowOffset) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)LocalShadowOffset));
UR_USE(Context), (void *)LocalShadowOffset));
ContextInfo->Stats.UpdateShadowFreed(LastAllocedSize);
LocalShadowOffset = 0;
LastAllocedSize = 0;
}

UR_CALL(getContext()->urDdiTable.USM.pfnDeviceAlloc(
Context, Device, nullptr, nullptr, RequiredShadowSize,
UR_USE(Context), Device, nullptr, nullptr, RequiredShadowSize,
(void **)&LocalShadowOffset));

// Initialize shadow memory
ur_result_t URes = EnqueueUSMBlockingSet(
Queue, (void *)LocalShadowOffset, 0, RequiredShadowSize);
if (URes != UR_RESULT_SUCCESS) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)LocalShadowOffset));
UR_USE(Context), (void *)LocalShadowOffset));
LocalShadowOffset = 0;
LastAllocedSize = 0;
}
Expand All @@ -298,25 +301,26 @@ ur_result_t ShadowMemoryGPU::AllocPrivateShadow(ur_queue_handle_t Queue,
(NumWG * ASAN_PRIVATE_SIZE) >> ASAN_SHADOW_SCALE;
static size_t LastAllocedSize = 0;
if (RequiredShadowSize > LastAllocedSize) {
auto ContextInfo = getAsanInterceptor()->getContextInfo(Context);
auto ContextInfo =
getAsanInterceptor()->getContextInfo(UR_USE(Context));
if (PrivateShadowOffset) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)PrivateShadowOffset));
UR_USE(Context), (void *)PrivateShadowOffset));
ContextInfo->Stats.UpdateShadowFreed(LastAllocedSize);
PrivateShadowOffset = 0;
LastAllocedSize = 0;
}

UR_CALL(getContext()->urDdiTable.USM.pfnDeviceAlloc(
Context, Device, nullptr, nullptr, RequiredShadowSize,
UR_USE(Context), Device, nullptr, nullptr, RequiredShadowSize,
(void **)&PrivateShadowOffset));

// Initialize shadow memory
ur_result_t URes = EnqueueUSMBlockingSet(
Queue, (void *)PrivateShadowOffset, 0, RequiredShadowSize);
if (URes != UR_RESULT_SUCCESS) {
UR_CALL(getContext()->urDdiTable.USM.pfnFree(
Context, (void *)PrivateShadowOffset));
UR_USE(Context), (void *)PrivateShadowOffset));
PrivateShadowOffset = 0;
LastAllocedSize = 0;
}
Expand Down
Loading
Loading