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

SWDEV-380035 - Check for agent and ptr match for hsa LOCKED ptr

Browse Source 
Change-Id: I2503aa05512aebc3535963e188ca8d1dbfab08f0
This commit is contained in:
Anusha GodavarthySurya
2023-02-09 23:46:06 +00:00
committed by Anusha Godavarthy Surya
parent 695f169ed0
commit fa35239b4b
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/device/rocm/rocdevice.cpp
+20 -14
View File
@@ -3188,7 +3188,9 @@ device::Signal* Device::createSignal() const {
amd::Memory* Device::GetArenaMemObj(const void* ptr, size_t& offset, size_t size) { amd::Memory* Device::GetArenaMemObj(const void* ptr, size_t& offset, size_t size) {
// Only create arena_mem_object if CPU memory is accessible from HMM // Only create arena_mem_object if CPU memory is accessible from HMM
// or if runtime received an interop from another ROCr's client // or if runtime received an interop from another ROCr's client
if (!info_.hmmCpuMemoryAccessible_ && !IsValidAllocation(ptr, size)) { hsa_amd_pointer_info_t ptr_info = {};
ptr_info.size = sizeof(hsa_amd_pointer_info_t);
if (!info_.hmmCpuMemoryAccessible_ && !IsValidAllocation(ptr, size, &ptr_info)) {
return nullptr; return nullptr;
} }
@@ -3203,12 +3205,18 @@ amd::Memory* Device::GetArenaMemObj(const void* ptr, size_t& offset, size_t size
return arena_mem_obj_; return arena_mem_obj_;
} }
} }
// Calculate the offset of the pointer. // Calculate the offset of the pointer.
const void* dev_ptr = reinterpret_cast<void*>(arena_mem_obj_->getDeviceMemory( const void* dev_ptr = reinterpret_cast<void*>(
*arena_mem_obj_->getContext().devices()[0])->virtualAddress()); arena_mem_obj_->getDeviceMemory(*arena_mem_obj_->getContext().devices()[0])
->virtualAddress());
// System memory which has been locked
if (ptr_info.type == HSA_EXT_POINTER_TYPE_LOCKED &&
getCpuAgent().handle == ptr_info.agentOwner.handle && ptr_info.hostBaseAddress == ptr) {
offset =
reinterpret_cast<size_t>(ptr_info.agentBaseAddress) - reinterpret_cast<size_t>(dev_ptr);
} else {
offset = reinterpret_cast<size_t>(ptr) - reinterpret_cast<size_t>(dev_ptr); offset = reinterpret_cast<size_t>(ptr) - reinterpret_cast<size_t>(dev_ptr);
}
return arena_mem_obj_; return arena_mem_obj_;
} }
@@ -3220,20 +3228,18 @@ void Device::ReleaseGlobalSignal(void* signal) const {
} }
// ================================================================================================ // ================================================================================================
bool Device::IsValidAllocation(const void* dev_ptr, size_t size) const { bool Device::IsValidAllocation(const void* dev_ptr, size_t size, hsa_amd_pointer_info_t* ptr_info) {
hsa_amd_pointer_info_t ptr_info = {};
ptr_info.size = sizeof(hsa_amd_pointer_info_t);
// Query ptr type to see if it's a HMM allocation // Query ptr type to see if it's a HMM allocation
hsa_status_t status = hsa_amd_pointer_info( hsa_status_t status =
const_cast<void*>(dev_ptr), &ptr_info, nullptr, nullptr, nullptr); hsa_amd_pointer_info(const_cast<void*>(dev_ptr), ptr_info, nullptr, nullptr, nullptr);
// The call should never fail in ROCR, but just check for an error and continue // The call should never fail in ROCR, but just check for an error and continue
if (status != HSA_STATUS_SUCCESS) { if (status != HSA_STATUS_SUCCESS) {
LogError("hsa_amd_pointer_info() failed"); LogError("hsa_amd_pointer_info() failed");
} }
// Check if it's a legacy non-HMM allocation in ROCr if (ptr_info->type != HSA_EXT_POINTER_TYPE_UNKNOWN) {
if (ptr_info.type != HSA_EXT_POINTER_TYPE_UNKNOWN) { if ((size != 0) &&
if ((size != 0) && ((reinterpret_cast<const_address>(dev_ptr) - ((reinterpret_cast<const_address>(dev_ptr) -
reinterpret_cast<const_address>(ptr_info.agentBaseAddress)) > size)) { reinterpret_cast<const_address>(ptr_info->agentBaseAddress)) > size)) {
return false; return false;
} }
return true; return true;
rocclr/device/rocm/rocdevice.hpp
+1 -1
View File
@@ -544,7 +544,7 @@ class Device : public NullDevice {
const bool isFineGrainSupported() const; const bool isFineGrainSupported() const;
//! Returns True if memory pointer is known to ROCr (excludes HMM allocations) //! Returns True if memory pointer is known to ROCr (excludes HMM allocations)
bool IsValidAllocation(const void* dev_ptr, size_t size) const; bool IsValidAllocation(const void* dev_ptr, size_t size, hsa_amd_pointer_info_t* ptr_info);
//! Allocates hidden heap for device memory allocations //! Allocates hidden heap for device memory allocations
void HiddenHeapAlloc(const VirtualGPU& gpu); void HiddenHeapAlloc(const VirtualGPU& gpu);