mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Hash test spurious fail fixed

Browse Source 
There was a race condition in the test itself,
causing the test reader access data after free.
This commit is contained in:
Maria Matejka 2024-11-25 09:44:00 +01:00
parent 2956faf5a6
commit 53431ff679
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hash_test.c
View File

@ -359,12 +359,14 @@ st_find_thread(void *_v)
uint skip = st_skip[atomic_fetch_add_explicit(&st_skip_pos, 1, memory_order_acq_rel)]; uint skip = st_skip[atomic_fetch_add_explicit(&st_skip_pos, 1, memory_order_acq_rel)];
for (u64 i = 0; !atomic_load_explicit(&st_end, memory_order_relaxed); i += skip) for (u64 i = 0; !atomic_load_explicit(&st_end, memory_order_acquire); i += skip)
{ {
struct st_node *n = SPINHASH_FIND(*v, ST, i % ST_MAX); struct st_node *n = SPINHASH_FIND(*v, ST, i % ST_MAX);
ASSERT_DIE(!n || (n->key == i % ST_MAX)); ASSERT_DIE(!n || (n->key == i % ST_MAX));
} }
atomic_fetch_add_explicit(&st_end, 1, memory_order_release);
rcu_thread_stop(); rcu_thread_stop();
return NULL; return NULL;
} }
@ -398,6 +400,11 @@ st_update_thread(void *_v)
atomic_store_explicit(&st_end, 1, memory_order_release); atomic_store_explicit(&st_end, 1, memory_order_release);
/* Wait for readers to properly end before releasing the memory,
* as the hash nodes may be accessed even after removed from hash */
while (atomic_load_explicit(&st_end, memory_order_acquire) < ST_READERS + 1)
birdloop_yield();
rcu_thread_stop(); rcu_thread_stop();
return NULL; return NULL;
} }