x

Author: bratpiorka

src/memory_props.c

@@ -30,14 +30,26 @@ umfGetMemoryPropertiesHandle(const void *ptr,
 
     tracker_alloc_info_t *info = NULL;
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &info);
-    if (ret != UMF_RESULT_SUCCESS) {
-        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+
+    if (ret == UMF_RESULT_SUCCESS) {
+        *props_handle = &info->props;
+        LOG_DEBUG("umfGetMemoryPropertiesHandle: props_handle=%p, id=%" PRIu64,
+                  *props_handle, (*props_handle)->id);
+        return UMF_RESULT_SUCCESS;
     }
 
-    *props_handle = &info->props;
+    // try to get IPC info
+    umf_ipc_info_t ipc_info;
+    ret = umfMemoryTrackerGetIpcInfo(ptr, &ipc_info);
+    if (ret != UMF_RESULT_SUCCESS) {
+        LOG_ERR("Failed to get memory properties handle for ptr=%p", ptr);
+        return ret;
+    }
 
-    LOG_DEBUG("umfGetMemoryPropertiesHandle: props_handle=%p, id=%" PRIu64,
-              *props_handle, (*props_handle)->id);
+    *props_handle = ipc_info.props;
+    LOG_DEBUG(
+        "umfGetMemoryPropertiesHandle (IPC info): props_handle=%p, id=%" PRIu64,
+        *props_handle, (*props_handle)->id);
 
     return UMF_RESULT_SUCCESS;
 }

src/provider/provider_tracking.c

@@ -47,6 +47,7 @@ struct umf_memory_tracker_t {
 };
 
 typedef struct tracker_ipc_info_t {
+    umf_memory_properties_t props;
     size_t size;
     umf_memory_provider_handle_t provider;
     ipc_opened_cache_value_t *ipc_cache_value;
@@ -410,6 +411,14 @@ umfMemoryTrackerAddIpcSegment(umf_memory_tracker_handle_t hTracker,
     value->provider = provider;
     value->ipc_cache_value = cache_entry;
 
+    memset(&value->props, 0, sizeof(umf_memory_properties_t));
+    value->props.id = utils_atomic_increment_u64(&unique_alloc_id);
+    value->props.base = (void *)ptr;
+    value->props.base_size = size;
+    value->props.provider = provider;
+    value->props.ptr = (void *)ptr;
+    value->props.pool = NULL; // TODO
+
     int ret =
         critnib_insert(hTracker->ipc_segments_map, (uintptr_t)ptr, value, 0);
     if (ret == 0) {
@@ -593,6 +602,8 @@ umf_result_t umfMemoryTrackerGetIpcInfo(const void *ptr,
     pIpcInfo->baseSize = rvalue->size;
     pIpcInfo->provider = rvalue->provider;
 
+    pIpcInfo->props = &rvalue->props;
+
     if (ref_value) {
         critnib_release(TRACKER->ipc_segments_map, ref_value);
     }

src/provider/provider_tracking.h

@@ -50,6 +50,8 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
                                           tracker_alloc_info_t **info);
 
 typedef struct umf_ipc_info_t {
+    umf_memory_properties_handle_t props;
+
     void *base;
     size_t baseSize;
     umf_memory_provider_handle_t provider;