Fix trackingFree() for providers not supporting free() op

Fix trackingFree() for providers not supporting free() op: do not add memory back to the tracker, if the provider does not support the free() operation. Signed-off-by: Lukasz Dorau <[email protected]>
oneapi-src · Nov 14, 2024 · ef80099 · ef80099
1 parent 08ce30c
commit ef80099
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/provider/provider_tracking.c b/src/provider/provider_tracking.c
@@ -382,6 +382,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 failed to free the memory");
+        // Do not add memory back to the tracker,
+        // if the provider does not support the free() op.
+        if (ret == UMF_RESULT_ERROR_NOT_SUPPORTED) {
+            return ret_remove;
+        }
+
         // Do not add memory back to the tracker,
         // if it had not been removed.
         if (ret_remove != UMF_RESULT_SUCCESS) {

diff --git a/test/provider_devdax_memory_ipc.cpp b/test/provider_devdax_memory_ipc.cpp
@@ -39,7 +39,7 @@ static std::vector<ipcTestParams> getIpcProxyPoolTestParamsList(void) {
 
     ipcProxyPoolTestParamsList = {
         {umfProxyPoolOps(), nullptr, umfDevDaxMemoryProviderOps(),
-         &defaultDevDaxParams, &hostAccessor, true},
+         &defaultDevDaxParams, &hostAccessor, false},
 #ifdef UMF_POOL_JEMALLOC_ENABLED
         {umfJemallocPoolOps(), nullptr, umfDevDaxMemoryProviderOps(),
          &defaultDevDaxParams, &hostAccessor, false},

diff --git a/test/provider_file_memory_ipc.cpp b/test/provider_file_memory_ipc.cpp
@@ -32,7 +32,7 @@ HostMemoryAccessor hostAccessor;
 static std::vector<ipcTestParams> ipcManyPoolsTestParamsList = {
 // TODO: enable it when sizes of allocations in ipcFixtures.hpp are fixed
 //    {umfProxyPoolOps(), nullptr, umfFileMemoryProviderOps(),
-//     &file_params_shared, &hostAccessor, true},
+//     &file_params_shared, &hostAccessor, false},
 #ifdef UMF_POOL_JEMALLOC_ENABLED
     {umfJemallocPoolOps(), nullptr, umfFileMemoryProviderOps(),
      &file_params_shared, &hostAccessor, false},