projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Use a filled signal mask to disable all signals
[userspace-rcu.git]
/
rculfhash.c
diff --git
a/rculfhash.c
b/rculfhash.c
index b9f795fd1349e6b28e2ac4c1e1f0de57154adad7..7080bb62ec528306b7cd42b05df5a1de7c788fc9 100644
(file)
--- a/
rculfhash.c
+++ b/
rculfhash.c
@@
-734,12
+734,6
@@
int is_removed(struct cds_lfht_node *node)
return ((unsigned long) node) & REMOVED_FLAG;
}
return ((unsigned long) node) & REMOVED_FLAG;
}
-static
-struct cds_lfht_node *flag_removed(struct cds_lfht_node *node)
-{
- return (struct cds_lfht_node *) (((unsigned long) node) | REMOVED_FLAG);
-}
-
static
int is_bucket(struct cds_lfht_node *node)
{
static
int is_bucket(struct cds_lfht_node *node)
{
@@
-764,6
+758,12
@@
struct cds_lfht_node *flag_removal_owner(struct cds_lfht_node *node)
return (struct cds_lfht_node *) (((unsigned long) node) | REMOVAL_OWNER_FLAG);
}
return (struct cds_lfht_node *) (((unsigned long) node) | REMOVAL_OWNER_FLAG);
}
+static
+struct cds_lfht_node *flag_removed_or_removal_owner(struct cds_lfht_node *node)
+{
+ return (struct cds_lfht_node *) (((unsigned long) node) | REMOVED_FLAG | REMOVAL_OWNER_FLAG);
+}
+
static
struct cds_lfht_node *get_end(void)
{
static
struct cds_lfht_node *get_end(void)
{
@@
-832,13
+832,16
@@
void _cds_lfht_gc_bucket(struct cds_lfht_node *bucket, struct cds_lfht_node *nod
assert(!is_bucket(bucket));
assert(!is_removed(bucket));
assert(!is_bucket(bucket));
assert(!is_removed(bucket));
+ assert(!is_removal_owner(bucket));
assert(!is_bucket(node));
assert(!is_removed(node));
assert(!is_bucket(node));
assert(!is_removed(node));
+ assert(!is_removal_owner(node));
for (;;) {
iter_prev = bucket;
/* We can always skip the bucket node initially */
iter = rcu_dereference(iter_prev->next);
assert(!is_removed(iter));
for (;;) {
iter_prev = bucket;
/* We can always skip the bucket node initially */
iter = rcu_dereference(iter_prev->next);
assert(!is_removed(iter));
+ assert(!is_removal_owner(iter));
assert(iter_prev->reverse_hash <= node->reverse_hash);
/*
* We should never be called with bucket (start of chain)
assert(iter_prev->reverse_hash <= node->reverse_hash);
/*
* We should never be called with bucket (start of chain)
@@
-859,6
+862,7
@@
void _cds_lfht_gc_bucket(struct cds_lfht_node *bucket, struct cds_lfht_node *nod
iter = next;
}
assert(!is_removed(iter));
iter = next;
}
assert(!is_removed(iter));
+ assert(!is_removal_owner(iter));
if (is_bucket(iter))
new_next = flag_bucket(clear_flag(next));
else
if (is_bucket(iter))
new_next = flag_bucket(clear_flag(next));
else
@@
-879,8
+883,10
@@
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
return -ENOENT;
assert(!is_removed(old_node));
return -ENOENT;
assert(!is_removed(old_node));
+ assert(!is_removal_owner(old_node));
assert(!is_bucket(old_node));
assert(!is_removed(new_node));
assert(!is_bucket(old_node));
assert(!is_removed(new_node));
+ assert(!is_removal_owner(new_node));
assert(!is_bucket(new_node));
assert(new_node != old_node);
for (;;) {
assert(!is_bucket(new_node));
assert(new_node != old_node);
for (;;) {
@@
-894,6
+900,12
@@
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
}
assert(old_next == clear_flag(old_next));
assert(new_node != old_next);
}
assert(old_next == clear_flag(old_next));
assert(new_node != old_next);
+ /*
+ * REMOVAL_OWNER flag is _NEVER_ set before the REMOVED
+ * flag. It is either set atomically at the same time
+ * (replace) or after (del).
+ */
+ assert(!is_removal_owner(old_next));
new_node->next = old_next;
/*
* Here is the whole trick for lock-free replace: we add
new_node->next = old_next;
/*
* Here is the whole trick for lock-free replace: we add
@@
-906,10
+918,12
@@
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
* the old node, but will not see the new one.
* This is a replacement of a node with another node
* that has the same value: we are therefore not
* the old node, but will not see the new one.
* This is a replacement of a node with another node
* that has the same value: we are therefore not
- * removing a value from the hash table.
+ * removing a value from the hash table. We set both the
+ * REMOVED and REMOVAL_OWNER flags atomically so we own
+ * the node after successful cmpxchg.
*/
ret_next = uatomic_cmpxchg(&old_node->next,
*/
ret_next = uatomic_cmpxchg(&old_node->next,
-
old_next, flag_removed
(new_node));
+
old_next, flag_removed_or_removal_owner
(new_node));
if (ret_next == old_next)
break; /* We performed the replacement. */
old_next = ret_next;
if (ret_next == old_next)
break; /* We performed the replacement. */
old_next = ret_next;
@@
-923,7
+937,7
@@
int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size,
bucket = lookup_bucket(ht, size, bit_reverse_ulong(old_node->reverse_hash));
_cds_lfht_gc_bucket(bucket, new_node);
bucket = lookup_bucket(ht, size, bit_reverse_ulong(old_node->reverse_hash));
_cds_lfht_gc_bucket(bucket, new_node);
- assert(is_removed(
rcu_dereference
(old_node->next)));
+ assert(is_removed(
CMM_LOAD_SHARED
(old_node->next)));
return 0;
}
return 0;
}
@@
-947,6
+961,7
@@
void _cds_lfht_add(struct cds_lfht *ht,
assert(!is_bucket(node));
assert(!is_removed(node));
assert(!is_bucket(node));
assert(!is_removed(node));
+ assert(!is_removal_owner(node));
bucket = lookup_bucket(ht, size, hash);
for (;;) {
uint32_t chain_len = 0;
bucket = lookup_bucket(ht, size, hash);
for (;;) {
uint32_t chain_len = 0;
@@
-1007,7
+1022,9
@@
void _cds_lfht_add(struct cds_lfht *ht,
insert:
assert(node != clear_flag(iter));
assert(!is_removed(iter_prev));
insert:
assert(node != clear_flag(iter));
assert(!is_removed(iter_prev));
+ assert(!is_removal_owner(iter_prev));
assert(!is_removed(iter));
assert(!is_removed(iter));
+ assert(!is_removal_owner(iter));
assert(iter_prev != node);
if (!bucket_flag)
node->next = clear_flag(iter);
assert(iter_prev != node);
if (!bucket_flag)
node->next = clear_flag(iter);
@@
-1027,6
+1044,7
@@
void _cds_lfht_add(struct cds_lfht *ht,
gc_node:
assert(!is_removed(iter));
gc_node:
assert(!is_removed(iter));
+ assert(!is_removal_owner(iter));
if (is_bucket(iter))
new_next = flag_bucket(clear_flag(next));
else
if (is_bucket(iter))
new_next = flag_bucket(clear_flag(next));
else
@@
-1061,10
+1079,15
@@
int _cds_lfht_del(struct cds_lfht *ht, unsigned long size,
* logical removal flag). Return -ENOENT if the node had
* previously been removed.
*/
* logical removal flag). Return -ENOENT if the node had
* previously been removed.
*/
- next =
rcu_dereference(node->next);
+ next =
CMM_LOAD_SHARED(node->next); /* next is not dereferenced */
if (caa_unlikely(is_removed(next)))
return -ENOENT;
assert(!is_bucket(next));
if (caa_unlikely(is_removed(next)))
return -ENOENT;
assert(!is_bucket(next));
+ /*
+ * The del operation semantic guarantees a full memory barrier
+ * before the uatomic_or atomic commit of the deletion flag.
+ */
+ cmm_smp_mb__before_uatomic_or();
/*
* We set the REMOVED_FLAG unconditionally. Note that there may
* be more than one concurrent thread setting this flag.
/*
* We set the REMOVED_FLAG unconditionally. Note that there may
* be more than one concurrent thread setting this flag.
@@
-1082,7
+1105,7
@@
int _cds_lfht_del(struct cds_lfht *ht, unsigned long size,
bucket = lookup_bucket(ht, size, bit_reverse_ulong(node->reverse_hash));
_cds_lfht_gc_bucket(bucket, node);
bucket = lookup_bucket(ht, size, bit_reverse_ulong(node->reverse_hash));
_cds_lfht_gc_bucket(bucket, node);
- assert(is_removed(
rcu_dereference
(node->next)));
+ assert(is_removed(
CMM_LOAD_SHARED
(node->next)));
/*
* Last phase: atomically exchange node->next with a version
* having "REMOVAL_OWNER_FLAG" set. If the returned node->next
/*
* Last phase: atomically exchange node->next with a version
* having "REMOVAL_OWNER_FLAG" set. If the returned node->next
@@
-1510,7
+1533,7
@@
void cds_lfht_lookup(struct cds_lfht *ht, unsigned long hash,
}
node = clear_flag(next);
}
}
node = clear_flag(next);
}
- assert(!node || !is_bucket(
rcu_dereference
(node->next)));
+ assert(!node || !is_bucket(
CMM_LOAD_SHARED
(node->next)));
iter->node = node;
iter->next = next;
}
iter->node = node;
iter->next = next;
}
@@
-1543,7
+1566,7
@@
void cds_lfht_next_duplicate(struct cds_lfht *ht, cds_lfht_match_fct match,
}
node = clear_flag(next);
}
}
node = clear_flag(next);
}
- assert(!node || !is_bucket(
rcu_dereference
(node->next)));
+ assert(!node || !is_bucket(
CMM_LOAD_SHARED
(node->next)));
iter->node = node;
iter->next = next;
}
iter->node = node;
iter->next = next;
}
@@
-1565,7
+1588,7
@@
void cds_lfht_next(struct cds_lfht *ht, struct cds_lfht_iter *iter)
}
node = clear_flag(next);
}
}
node = clear_flag(next);
}
- assert(!node || !is_bucket(
rcu_dereference
(node->next)));
+ assert(!node || !is_bucket(
CMM_LOAD_SHARED
(node->next)));
iter->node = node;
iter->next = next;
}
iter->node = node;
iter->next = next;
}
@@
-1668,7
+1691,7
@@
int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_node *node)
int cds_lfht_is_node_deleted(struct cds_lfht_node *node)
{
int cds_lfht_is_node_deleted(struct cds_lfht_node *node)
{
- return is_removed(
rcu_dereference
(node->next));
+ return is_removed(
CMM_LOAD_SHARED
(node->next));
}
static
}
static
@@
-1684,6
+1707,7
@@
int cds_lfht_delete_bucket(struct cds_lfht *ht)
if (!is_bucket(node))
return -EPERM;
assert(!is_removed(node));
if (!is_bucket(node))
return -EPERM;
assert(!is_removed(node));
+ assert(!is_removal_owner(node));
} while (!is_end(node));
/*
* size accessed without rcu_dereference because hash table is
} while (!is_end(node));
/*
* size accessed without rcu_dereference because hash table is
@@
-1715,8
+1739,10
@@
int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr)
/* Wait for in-flight resize operations to complete */
_CMM_STORE_SHARED(ht->in_progress_destroy, 1);
cmm_smp_mb(); /* Store destroy before load resize */
/* Wait for in-flight resize operations to complete */
_CMM_STORE_SHARED(ht->in_progress_destroy, 1);
cmm_smp_mb(); /* Store destroy before load resize */
+ ht->flavor->thread_offline();
while (uatomic_read(&ht->in_progress_resize))
poll(NULL, 0, 100); /* wait for 100ms */
while (uatomic_read(&ht->in_progress_resize))
poll(NULL, 0, 100); /* wait for 100ms */
+ ht->flavor->thread_online();
ret = cds_lfht_delete_bucket(ht);
if (ret)
return ret;
ret = cds_lfht_delete_bucket(ht);
if (ret)
return ret;
This page took
0.029684 seconds
and
4
git commands to generate.