8000 Fix `trackingFree()` - do not add a not removed entry by ldorau · Pull Request #803 · oneapi-src/unified-memory-framework · GitHub
[go: up one dir, main page]
Skip to content

Fix trackingFree() - do not add a not removed entry #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Fix trackingFree() - do not add a not removed entry #803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72cb5f7
Add debug message to umfMemoryTrackerRemove()
ldorau Oct 15, 2024
1b32ade
Fix trackingFree() - do not add a not removed entry
ldorau Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/provider/provider_tracking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ static umf_result_t umfMemoryTrackerRemove(umf_memory_tracker_handle_t hTracker,
return UMF_RESULT_ERROR_UNKNOWN;
}

tracker_value_t *v = value;

LOG_DEBUG("memory region removed: tracker=%p, ptr=%p, size=%zu",
(void *)hTracker, ptr, v->size);

umf_ba_free(hTracker->tracker_allocator, value);

return UMF_RESULT_SUCCESS;
Expand Down Expand Up @@ -332,6 +337,7 @@ static umf_result_t trackingAllocationMerge(void *hProvider, void *lowPtr,

static umf_result_t trackingFree(void *hProvider, void *ptr, size_t size) {
umf_result_t ret;
umf_result_t ret_remove = UMF_RESULT_ERROR_UNKNOWN;
umf_tracking_memory_provider_t *p =
(umf_tracking_memory_provider_t *)hProvider;

Expand All @@ -340,13 +346,13 @@ static umf_result_t trackingFree(void *hProvider, void *ptr, size_t size) {
// could allocate the memory at address `ptr` before a call to umfMemoryTrackerRemove
// resulting in inconsistent state.
if (ptr) {
ret = umfMemoryTrackerRemove(p->hTracker, ptr);
if (ret != UMF_RESULT_SUCCESS) {
ret_remove = umfMemoryTrackerRemove(p->hTracker, ptr);
if (ret_remove != UMF_RESULT_SUCCESS) {
// DO NOT return an error here, because the tracking provider
// cannot change behaviour of the upstream provider.
LOG_ERR("failed to remove the region from the tracker, ptr=%p, "
"size=%zu, ret = %d",
ptr, size, ret);
ptr, size, ret_remove);
}
}

Expand All @@ -366,6 +372,12 @@ static umf_result_t trackingFree(void *hProvider, void *ptr, size_t size) {
ret = umfMemoryProviderFree(p->hUpstream, ptr, size);
if (ret != UMF_RESULT_SUCCESS) {
LOG_ERR("upstream provider is failed to free the memory");
// Do not add memory back to the tracker,
// if it had not been removed.
if (ret_remove != UMF_RESULT_SUCCESS) {
return ret;
}

if (umfMemoryTrackerAdd(p->hTracker, p->pool, ptr, size) !=
UMF_RESULT_SUCCESS) {
LOG_ERR(
Expand Down
Loading
0