tracker props

Author: bratpiorka

.github/workflows/pr_push.yml

@@ -20,4 +20,5 @@ jobs:
   Build:
     name: Basic builds
     uses: ./.github/workflows/reusable_basic.yml
-  
+  Sanitizers:
+    uses: ./.github/workflows/reusable_sanitizers.yml

FlameGraph

@@ -0,0 +1 @@
+Subproject commit 41fee1f99f9276008b7cd112fca19dc3ea84ac32

src/ipc.c

@@ -58,8 +58,8 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
 
     size_t ipcHandleSize = 0;
-    umf_alloc_info_t allocInfo;
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("cannot get alloc info for ptr = %p.", ptr);
         return ret;

src/memory_props.c

@@ -19,13 +19,17 @@ umf_result_t
 umfGetMemoryPropertiesHandle(const void *ptr,
                              umf_memory_properties_handle_t *props_handle) {
 
-    // TODO remove?
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, props_handle);
+    if (props_handle == NULL) {
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
+
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
+    *props_handle = allocInfo.props;
 
     return UMF_RESULT_SUCCESS;
 }

src/memory_props_internal.h

@@ -26,22 +26,13 @@ extern "C" {
 #endif
 
 typedef struct umf_memory_properties_t {
-    // TODO move to alloc_info_t w/o gpu_props
+    // TODO alloc_info_t
     void *ptr;
     umf_memory_pool_handle_t pool;
     umf_memory_provider_handle_t provider;
     uint64_t id;
     void *base;
     size_t base_size;
-
-    // TODO
-    bool gpu_properties_initialized;
-    union {
-#if UMF_BUILD_LEVEL_ZERO_PROVIDER
-        ze_memory_allocation_properties_t ze_properties;
-#endif
-        int unused; // in case of no GPU support
-    } gpu;
 } umf_memory_properties_t;
 
 #ifdef __cplusplus

src/pool/pool_disjoint.c

@@ -884,8 +884,8 @@ size_t disjoint_pool_malloc_usable_size(void *pool, const void *ptr) {
             critnib_release(disjoint_pool->known_slabs, ref_slab);
         }
 
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (ret != UMF_RESULT_SUCCESS) {
             return 0;
         }
@@ -925,8 +925,8 @@ umf_result_t disjoint_pool_free(void *pool, void *ptr) {
             critnib_release(disjoint_pool->known_slabs, ref_slab);
         }
 
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (ret != UMF_RESULT_SUCCESS) {
             TLS_last_allocation_error = ret;
             LOG_ERR("failed to get allocation info from the memory tracker");

src/pool/pool_proxy.c

@@ -97,9 +97,8 @@ static umf_result_t proxy_free(void *pool, void *ptr) {
     struct proxy_memory_pool *hPool = (struct proxy_memory_pool *)pool;
 
     if (ptr) {
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t umf_result =
-            umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t umf_result = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (umf_result == UMF_RESULT_SUCCESS) {
             size = allocInfo.baseSize;
         }

src/provider/provider_tracking.c

@@ -50,7 +50,6 @@ typedef struct tracker_alloc_info_t {
     umf_memory_properties_t props;
 
     // TODO remove
-    umf_memory_pool_handle_t pool;
     size_t size;
 
     // number of overlapping memory regions in the next level of map falling
@@ -198,13 +197,13 @@ umfMemoryTrackerAddAtLevel(umf_memory_tracker_handle_t hTracker, int level,
         return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
     }
 
-    value->pool = pool;
-
     memset(&value->props, 0, sizeof(umf_memory_properties_t));
     umfPoolGetMemoryProvider(pool, &value->props.provider);
     value->props.id = utils_atomic_increment_u64(&unique_alloc_id);
     value->props.base = (void *)ptr;
     value->props.base_size = size;
+    value->props.pool = pool;
+    value->props.ptr = (void *)ptr;
 
     value->size = size;
     value->n_children = 0;
@@ -313,8 +312,8 @@ static umf_result_t umfMemoryTrackerAdd(umf_memory_tracker_handle_t hTracker,
                     "cannot insert to the tracker value (pool=%p, ptr=%p, "
                     "size=%zu) "
                     "that exceeds the parent value (pool=%p, ptr=%p, size=%zu)",
-                    (void *)pool, ptr, size, (void *)rvalue->pool, (void *)rkey,
-                    (size_t)rsize);
+                    (void *)pool, ptr, size, (void *)rvalue->props.pool,
+                    (void *)rkey, (size_t)rsize);
                 return UMF_RESULT_ERROR_INVALID_ARGUMENT;
             }
             parent_key = rkey;
@@ -376,7 +375,8 @@ static umf_result_t umfMemoryTrackerRemove(umf_memory_tracker_handle_t hTracker,
 
     LOG_DEBUG("memory region removed: tracker=%p, level=%i, pool=%p, ptr=%p, "
               "size=%zu",
-              (void *)hTracker, level, (void *)value->pool, ptr, value->size);
+              (void *)hTracker, level, (void *)value->props.pool, ptr,
+              value->size);
 
     // release the reference to the value got from critnib_remove()
     assert(ref_value);
@@ -388,8 +388,9 @@ static umf_result_t umfMemoryTrackerRemove(umf_memory_tracker_handle_t hTracker,
         LOG_DEBUG(
             "child #%zu removed from memory region: tracker=%p, level=%i, "
             "pool=%p, ptr=%p, size=%zu",
-            n_children, (void *)hTracker, level - 1, (void *)parent_value->pool,
-            (void *)parent_key, parent_value->size);
+            n_children, (void *)hTracker, level - 1,
+            (void *)parent_value->props.pool, (void *)parent_key,
+            parent_value->size);
 
         assert(ref_parent_value);
         assert(level >= 1);
@@ -472,18 +473,17 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
 }
 
 umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr) {
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return NULL;
     }
 
     return allocInfo.pool;
 }
 
-umf_result_t
-umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
-                             umf_memory_properties_handle_t *props) {
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          umf_alloc_info_t *pAllocInfo) {
     assert(pAllocInfo);
 
     if (ptr == NULL) {
@@ -571,12 +571,9 @@ umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
 
     pAllocInfo->base = (void *)top_most_key;
     pAllocInfo->baseSize = top_most_value->size;
-    pAllocInfo->pool = top_most_value->pool;
+    pAllocInfo->pool = top_most_value->props.pool;
+    pAllocInfo->props = &top_most_value->props;
 
-    if (props != NULL) {
-        *props = &top_most_value->props;
-    }
-    
     assert(ref_top_most_value);
     critnib_release(TRACKER->alloc_segments_map[ref_level], ref_top_most_value);
 
@@ -823,7 +820,7 @@ static umf_result_t trackingAllocationMerge(void *hProvider, void *lowPtr,
         ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
         goto err_fatal;
     }
-    if (lowValue->pool != highValue->pool) {
+    if (lowValue->props.pool != highValue->props.pool) {
         LOG_FATAL("pool mismatch");
         ret = UMF_RESULT_ERROR_INVALID_ARGUMENT;
         goto err_fatal;
@@ -968,12 +965,13 @@ static void check_if_tracker_is_empty(umf_memory_tracker_handle_t hTracker,
 
         while (1 == critnib_find(hTracker->alloc_segments_map[i], last_key,
                                  FIND_G, &rkey, (void **)&rvalue, &ref_value)) {
-            if (rvalue && ((rvalue->pool == pool) || pool == NULL)) {
+            if (rvalue && ((rvalue->props.pool == pool) || pool == NULL)) {
                 n_items++;
                 LOG_DEBUG(
                     "found abandoned allocation in the tracking provider: "
                     "pool=%p, ptr=%p, size=%zu",
-                    (void *)rvalue->pool, (void *)rkey, (size_t)rvalue->size);
+                    (void *)rvalue->props.pool, (void *)rkey,
+                    (size_t)rvalue->size);
             }
 
             if (ref_value) {

src/provider/provider_tracking.h

@@ -41,11 +41,12 @@ typedef struct umf_alloc_info_t {
     void *base;
     size_t baseSize;
     umf_memory_pool_handle_t pool;
+
+    umf_memory_properties_handle_t props;
 } umf_alloc_info_t;
 
-umf_result_t
-umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
-                             umf_memory_properties_handle_t *props_handle);
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          umf_alloc_info_t *pAllocInfo);
 
 typedef struct umf_ipc_info_t {
     void *base;