a

Author: bratpiorka

cmake/helpers.cmake

@@ -273,7 +273,14 @@ function(add_umf_target_compile_options name)
                     # disable warning 6326: Potential comparison of a constant
                     # with another constant
                     /wd6326
-                    # disable 4200 warning: nonstandard extension used:
+                    # disable warning 28112: a variable (ptr) which is accessed
+                    # via an Interlocked function must always be accessed via an
+                    # Interlocked function
+                    /wd28112
+                    # disable warning 4324: structure was padded due to
+                    # alignment specifier
+                    /wd4324
+                    # disable warning 4200: nonstandard extension used:
                     # zero-sized array in struct/union
                     /wd4200)
         if(UMF_DEVELOPER_MODE)

src/critnib/critnib.c

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -110,6 +110,7 @@ struct critnib_node {
     struct critnib_node *child[SLNODES];
     word path;
     sh_t shift;
+    size_t a;
 };
 
 struct critnib_leaf {
@@ -118,7 +119,8 @@ struct critnib_leaf {
 };
 
 struct critnib {
-    struct critnib_node *root;
+    CACHE_ALIGNED struct critnib_node *root;
+    CACHE_ALIGNED uint64_t remove_count;
 
     /* pool of freed nodes: singly linked list, next at child[0] */
     struct critnib_node *deleted_node;
@@ -128,29 +130,9 @@ struct critnib {
     struct critnib_node *pending_del_nodes[DELETED_LIFE];
     struct critnib_leaf *pending_del_leaves[DELETED_LIFE];
 
-    uint64_t remove_count;
-
     struct utils_mutex_t mutex; /* writes/removes */
 };
 
-/*
- * atomic load
- */
-static void load(void *src, void *dst) {
-    utils_atomic_load_acquire((word *)src, (word *)dst);
-}
-
-static void load64(uint64_t *src, uint64_t *dst) {
-    utils_atomic_load_acquire(src, dst);
-}
-
-/*
- * atomic store
- */
-static void store(void *dst, void *src) {
-    utils_atomic_store_release((word *)dst, (word)src);
-}
-
 /*
  * internal: is_leaf -- check tagged pointer for leafness
  */
@@ -180,7 +162,7 @@ static inline unsigned slice_index(word key, sh_t shift) {
  * critnib_new -- allocates a new critnib structure
  */
 struct critnib *critnib_new(void) {
-    struct critnib *c = umf_ba_global_alloc(sizeof(struct critnib));
+    struct critnib *c = umf_ba_global_aligned_alloc(sizeof(struct critnib), 64);
     if (!c) {
         return NULL;
     }
@@ -272,7 +254,7 @@ static void free_node(struct critnib *__restrict c,
  */
 static struct critnib_node *alloc_node(struct critnib *__restrict c) {
     if (!c->deleted_node) {
-        return umf_ba_global_alloc(sizeof(struct critnib_node));
+        return umf_ba_global_aligned_alloc(sizeof(struct critnib_node), 64);
     }
 
     struct critnib_node *n = c->deleted_node;
@@ -303,7 +285,7 @@ static void free_leaf(struct critnib *__restrict c,
  */
 static struct critnib_leaf *alloc_leaf(struct critnib *__restrict c) {
     if (!c->deleted_leaf) {
-        return umf_ba_global_alloc(sizeof(struct critnib_leaf));
+        return umf_ba_global_aligned_alloc(sizeof(struct critnib_leaf), 64);
     }
 
     struct critnib_leaf *k = c->deleted_leaf;
@@ -339,18 +321,16 @@ int critnib_insert(struct critnib *c, word key, void *value, int update) {
     k->key = key;
     k->value = value;
 
-    struct critnib_node *kn = (void *)((word)k | 1);
+    CACHE_ALIGNED struct critnib_node *kn = (void *)((word)k | 1);
 
     struct critnib_node *n = c->root;
     if (!n) {
-        store(&c->root, kn);
-
+        utils_atomic_store_release_ptr(&c->root, kn);
         utils_mutex_unlock(&c->mutex);
-
         return 0;
     }
 
-    struct critnib_node **parent = &c->root;
+    CACHE_ALIGNED struct critnib_node **parent = &c->root;
     struct critnib_node *prev = c->root;
 
     while (n && !is_leaf(n) && (key & path_mask(n->shift)) == n->path) {
@@ -361,7 +341,8 @@ int critnib_insert(struct critnib *c, word key, void *value, int update) {
 
     if (!n) {
         n = prev;
-        store(&n->child[slice_index(key, n->shift)], kn);
+        utils_atomic_store_release_ptr(&n->child[slice_index(key, n->shift)],
+                                       kn);
 
         utils_mutex_unlock(&c->mutex);
 
@@ -406,7 +387,7 @@ int critnib_insert(struct critnib *c, word key, void *value, int update) {
     m->child[slice_index(path, sh)] = n;
     m->shift = sh;
     m->path = key & path_mask(sh);
-    store(parent, m);
+    utils_atomic_store_release_ptr(parent, m);
 
     utils_mutex_unlock(&c->mutex);
 
@@ -427,7 +408,8 @@ void *critnib_remove(struct critnib *c, word key) {
         goto not_found;
     }
 
-    word del = (utils_atomic_increment(&c->remove_count) - 1) % DELETED_LIFE;
+    word del =
+        (utils_atomic_increment_u64(&c->remove_count) - 1) % DELETED_LIFE;
     free_node(c, c->pending_del_nodes[del]);
     free_leaf(c, c->pending_del_leaves[del]);
     c->pending_del_nodes[del] = NULL;
@@ -436,7 +418,7 @@ void *critnib_remove(struct critnib *c, word key) {
     if (is_leaf(n)) {
         k = to_leaf(n);
         if (k->key == key) {
-            store(&c->root, NULL);
+            utils_atomic_store_release_ptr(&c->root, NULL);
             goto del_leaf;
         }
 
@@ -466,7 +448,7 @@ void *critnib_remove(struct critnib *c, word key) {
         goto not_found;
     }
 
-    store(&n->child[slice_index(key, n->shift)], NULL);
+    utils_atomic_store_release_ptr(&n->child[slice_index(key, n->shift)], NULL);
 
     /* Remove the node if there's only one remaining child. */
     int ochild = -1;
@@ -482,7 +464,7 @@ void *critnib_remove(struct critnib *c, word key) {
 
     ASSERTne(ochild, -1);
 
-    store(n_parent, n->child[ochild]);
+    utils_atomic_store_release_ptr(n_parent, n->child[ochild]);
     c->pending_del_nodes[del] = n;
 
 del_leaf:
@@ -511,22 +493,23 @@ void *critnib_get(struct critnib *c, word key) {
     do {
         struct critnib_node *n;
 
-        load64(&c->remove_count, &wrs1);
-        load(&c->root, &n);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs1);
+        utils_atomic_load_acquire_ptr(&c->root, (void **)&n);
 
         /*
 		 * critbit algorithm: dive into the tree, looking at nothing but
 		 * each node's critical bit^H^H^Hnibble.  This means we risk
 		 * going wrong way if our path is missing, but that's ok...
 		 */
         while (n && !is_leaf(n)) {
-            load(&n->child[slice_index(key, n->shift)], &n);
+            utils_atomic_load_acquire_ptr(&n->child[slice_index(key, n->shift)],
+                                          (void **)&n);
         }
 
         /* ... as we check it at the end. */
         struct critnib_leaf *k = to_leaf(n);
         res = (n && k->key == key) ? k->value : NULL;
-        load64(&c->remove_count, &wrs2);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs2);
     } while (wrs1 + DELETED_LIFE <= wrs2);
 
     return res;
@@ -597,7 +580,7 @@ static struct critnib_leaf *find_le(struct critnib_node *__restrict n,
     /* recursive call: follow the path */
     {
         struct critnib_node *m;
-        load(&n->child[nib], &m);
+        utils_atomic_load_acquire_ptr(&n->child[nib], (void **)&m);
         struct critnib_leaf *k = find_le(m, key);
         if (k) {
             return k;
@@ -611,7 +594,7 @@ static struct critnib_leaf *find_le(struct critnib_node *__restrict n,
 	 */
     for (; nib > 0; nib--) {
         struct critnib_node *m;
-        load(&n->child[nib - 1], &m);
+        utils_atomic_load_acquire_ptr(&n->child[nib - 1], (void **)&m);
         if (m) {
             n = m;
             if (is_leaf(n)) {
@@ -635,12 +618,12 @@ void *critnib_find_le(struct critnib *c, word key) {
     void *res;
 
     do {
-        load64(&c->remove_count, &wrs1);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs1);
         struct critnib_node *n; /* avoid a subtle TOCTOU */
-        load(&c->root, &n);
+        utils_atomic_load_acquire_ptr(&c->root, (void **)&n);
         struct critnib_leaf *k = n ? find_le(n, key) : NULL;
         res = k ? k->value : NULL;
-        load64(&c->remove_count, &wrs2);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs2);
     } while (wrs1 + DELETED_LIFE <= wrs2);
 
     return res;
@@ -694,7 +677,7 @@ static struct critnib_leaf *find_ge(struct critnib_node *__restrict n,
     unsigned nib = slice_index(key, n->shift);
     {
         struct critnib_node *m;
-        load(&n->child[nib], &m);
+        utils_atomic_load_acquire_ptr(&n->child[nib], (void **)&m);
         struct critnib_leaf *k = find_ge(m, key);
         if (k) {
             return k;
@@ -703,7 +686,7 @@ static struct critnib_leaf *find_ge(struct critnib_node *__restrict n,
 
     for (; nib < NIB; nib++) {
         struct critnib_node *m;
-        load(&n->child[nib + 1], &m);
+        utils_atomic_load_acquire_ptr(&n->child[nib + 1], (void **)&m);
         if (m) {
             n = m;
             if (is_leaf(n)) {
@@ -741,17 +724,18 @@ int critnib_find(struct critnib *c, uintptr_t key, enum find_dir_t dir,
     }
 
     do {
-        load64(&c->remove_count, &wrs1);
-        struct critnib_node *n;
-        load(&c->root, &n);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs1);
+        CACHE_ALIGNED struct critnib_node *n;
+        utils_atomic_load_acquire_ptr(&c->root, (void **)&n);
 
         if (dir < 0) {
             k = find_le(n, key);
         } else if (dir > 0) {
             k = find_ge(n, key);
         } else {
             while (n && !is_leaf(n)) {
-                load(&n->child[slice_index(key, n->shift)], &n);
+                utils_atomic_load_acquire_ptr(
+                    &n->child[slice_index(key, n->shift)], (void **)&n);
             }
 
             struct critnib_leaf *kk = to_leaf(n);
@@ -761,7 +745,7 @@ int critnib_find(struct critnib *c, uintptr_t key, enum find_dir_t dir,
             _rkey = k->key;
             _rvalue = k->value;
         }
-        load64(&c->remove_count, &wrs2);
+        utils_atomic_load_acquire_u64(&c->remove_count, &wrs2);
     } while (wrs1 + DELETED_LIFE <= wrs2);
 
     if (k) {

src/ipc_cache.c

@@ -28,10 +28,10 @@ typedef struct ipc_opened_cache_entry_t *hash_map_t;
 typedef struct ipc_opened_cache_entry_t *lru_list_t;
 
 typedef struct ipc_opened_cache_entry_t {
+    uint64_t ref_count;
     UT_hash_handle hh;
     struct ipc_opened_cache_entry_t *next, *prev;
     ipc_opened_cache_key_t key;
-    uint64_t ref_count;
     uint64_t handle_id;
     hash_map_t
         *hash_table; // pointer to the hash table to which the entry belongs
@@ -70,6 +70,7 @@ umf_result_t umfIpcCacheGlobalInit(void) {
         goto err_cache_global_free;
     }
 
+    // TODO: create aligned-allocator
     cache_global->cache_allocator =
         umf_ba_create(sizeof(ipc_opened_cache_entry_t));
     if (!cache_global->cache_allocator) {
@@ -232,7 +233,7 @@ umf_result_t umfIpcOpenedCacheGet(ipc_opened_cache_handle_t cache,
 
 exit:
     if (ret == UMF_RESULT_SUCCESS) {
-        utils_atomic_increment(&entry->ref_count);
+        utils_atomic_increment_u64(&entry->ref_count);
         *retEntry = &entry->value;
     }
 

src/libumf.c

@@ -24,10 +24,10 @@
 
 umf_memory_tracker_handle_t TRACKER = NULL;
 
-static unsigned long long umfRefCount = 0;
+static uint64_t umfRefCount = 0;
 
 int umfInit(void) {
-    if (utils_fetch_and_add64(&umfRefCount, 1) == 0) {
+    if (utils_fetch_and_add_u64(&umfRefCount, 1) == 0) {
         utils_log_init();
         TRACKER = umfMemoryTrackerCreate();
         if (!TRACKER) {
@@ -54,7 +54,7 @@ int umfInit(void) {
 }
 
 void umfTearDown(void) {
-    if (utils_fetch_and_add64(&umfRefCount, -1) == 1) {
+    if (utils_fetch_and_sub_u64(&umfRefCount, 1) == 1) {
 #if !defined(_WIN32) && !defined(UMF_NO_HWLOC)
         umfMemspaceHostAllDestroy();
         umfMemspaceHighestCapacityDestroy();