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

SWDEV-380258 - Fix invalid iterator after erase

Browse Source 
Fix rare segfault due to invalid iterator after erase

Change-Id: Id5b54d6cf10075deff0d613fec12af249c6c55a3
This commit is contained in:
David Yat Sin
2023-01-31 17:46:15 +00:00
parent ad33a021cb
commit 08d72c4f98
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/device/rocm/rocdevice.cpp
+5 -5
View File
@@ -236,17 +236,17 @@ Device::~Device() {
}
for (auto& it : queuePool_) {
for (auto& qIter : it) {
hsa_queue_t* queue = qIter.first;
auto& qInfo = qIter.second;
for (auto qIter = it.begin(); qIter != it.end(); ) {
hsa_queue_t* queue = qIter->first;
auto& qInfo = qIter->second;
if (qInfo.hostcallBuffer_) {
ClPrint(amd::LOG_INFO, amd::LOG_QUEUE, "deleting hostcall buffer %p for hardware queue %p",
qInfo.hostcallBuffer_, qIter.first);
qInfo.hostcallBuffer_, qIter->first);
disableHostcalls(qInfo.hostcallBuffer_);
context().svmFree(qInfo.hostcallBuffer_);
}
ClPrint(amd::LOG_INFO, amd::LOG_QUEUE, "deleting hardware queue %p with refCount 0", queue);
it.erase(queue);
qIter = it.erase(qIter);
hsa_queue_destroy(queue);
}
}