SWDEV-327967 - Fix Segmentation fault in hipFree

Queue creation and release fails during hipFree causing seg fault
if the null queue was not created until then and there is no
device memory left.

Change-Id: I118b86b58e777dac5415bc9ba0c4e23c986efa7d


[ROCm/clr commit: 4a90c3ccaf]
This commit is contained in:
Satyanvesh Dittakavi
2022-03-21 10:57:30 +00:00
parent d29a3ae502
commit 6a849eb690
2 changed files with 7 additions and 2 deletions
+4 -1
View File
@@ -101,7 +101,10 @@ hipError_t ihipFree(void *ptr)
}
} else {
// Wait on the device, associated with the current memory object
hip::getNullStream(memory_object->getContext())->finish();
amd::HostQueue* queue = hip::getNullStream(memory_object->getContext());
if (queue != nullptr) {
queue->finish();
}
deviceID = hip::getDeviceID(memory_object->getContext());
}
hip::Stream::syncNonBlockingStreams(deviceID);
+3 -1
View File
@@ -110,7 +110,9 @@ bool Stream::Create() {
queue->vdev()->profilerAttach(isProfilerAttached);
device_->SaveQueue(queue);
} else if (queue != nullptr) {
queue->release();
// Queue creation has failed, and virtual device associated with the queue may not be created.
// Just need to delete the queue instance.
delete queue;
}
return result;