AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-413997 - Physical address size could be more than mapped size, only virtual address needs to be match the size of unmap request.

Browse Source 
Change-Id: If0e973149d8ce1b6f01000ab951cf6e9f4b38e97


[ROCm/clr commit: 0f9c624f4c]
This commit is contained in:
kjayapra-amd
2023-12-27 15:59:42 -05:00
committed by Karthik Jayaprakash
parent ad499128d6
commit b457d0ba82
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/src/hip_vm.cpp
+12 -6
View File
@@ -306,11 +306,17 @@ hipError_t hipMemUnmap(void* ptr, size_t size) {
HIP_RETURN(hipErrorInvalidValue);
}
amd::Memory* va = amd::MemObjMap::FindMemObj(ptr);
if (va && va->getSize() != size) {
amd::Memory* pa = amd::MemObjMap::FindMemObj(ptr);
if (pa == nullptr) {
HIP_RETURN(hipErrorInvalidValue);
}
auto& queue = *g_devices[va->getUserData().deviceId]->NullStream();
amd::Memory* va = amd::MemObjMap::FindVirtualMemObj(ptr);
if (va == nullptr && va->getSize() != size) {
HIP_RETURN(hipErrorInvalidValue);
}
auto& queue = *g_devices[pa->getUserData().deviceId]->NullStream();
amd::Command* cmd = new amd::VirtualMapCommand(queue, amd::Command::EventWaitList{}, ptr, size,
nullptr);
@@ -318,9 +324,9 @@ hipError_t hipMemUnmap(void* ptr, size_t size) {
cmd->awaitCompletion();
cmd->release();
// restore the original va of the generic allocation
hip::GenericAllocation* ga = reinterpret_cast<hip::GenericAllocation*>(va->getUserData().data);
va->setSvmPtr(ga->genericAddress());
// restore the original pa of the generic allocation
hip::GenericAllocation* ga = reinterpret_cast<hip::GenericAllocation*>(pa->getUserData().data);
pa->setSvmPtr(ga->genericAddress());
ga->release();