From 707ec427bcd52e1016e58e6bd2fc6a8dd1c43504 Mon Sep 17 00:00:00 2001 From: kjayapra-amd Date: Tue, 9 Jun 2020 20:08:37 -0400 Subject: [PATCH] SWDEV-231701 - Remove amd::memory->svm_ptr from MemObj, instead of the ptr to the object. Change-Id: I5aab450a2320cfa5417c284e2a8454102df6f99d [ROCm/hip commit: 2f8e180f013532c1609fb04071289b9116c809f3] --- projects/hip/rocclr/hip_memory.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/hip/rocclr/hip_memory.cpp b/projects/hip/rocclr/hip_memory.cpp index 9af33d9c74..84c8b77f92 100755 --- a/projects/hip/rocclr/hip_memory.cpp +++ b/projects/hip/rocclr/hip_memory.cpp @@ -2026,7 +2026,12 @@ hipError_t hipIpcCloseMemHandle(void* dev_ptr) { } /* Remove the memory from MemObjMap */ - amd::MemObjMap::RemoveMemObj(amd_mem_obj); + if (amd_mem_obj->getSvmPtr() != nullptr) { + amd::MemObjMap::RemoveMemObj(amd_mem_obj->getSvmPtr()); + } else { + DevLogPrintfError("Does not have SVM or Host Mem for 0x%x, crash here!", dev_ptr); + guarantee(false); + } /* detach the memory */ if (!device->IpcDetach(*amd_mem_obj)){