X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.c;h=0e1252fdbba707e4515cbbabe8c8a837a6408c79;hp=56d86f9e561d6ea8fc372eed83ffc36f35dc358b;hb=0ecb3fde04135d76545ce55d80abea9aef465b54;hpb=7e30abe3df0e83eeb741bfc18d07cb016af804a1 diff --git a/urcu-qsbr.c b/urcu-qsbr.c index 56d86f9..0e1252f 100644 --- a/urcu-qsbr.c +++ b/urcu-qsbr.c @@ -39,20 +39,20 @@ void __attribute__((destructor)) rcu_exit(void); -static pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER; int gp_futex; /* * Global grace period counter. */ -unsigned long urcu_gp_ctr = RCU_GP_ONLINE; +unsigned long rcu_gp_ctr = RCU_GP_ONLINE; /* * Written to only by each individual reader. Read by both the reader and the * writers. */ -struct urcu_reader __thread urcu_reader; +struct rcu_reader __thread rcu_reader; #ifdef DEBUG_YIELD unsigned int yield_active; @@ -61,18 +61,18 @@ unsigned int __thread rand_yield; static LIST_HEAD(registry); -static void internal_urcu_lock(void) +static void mutex_lock(pthread_mutex_t *mutex) { int ret; #ifndef DISTRUST_SIGNALS_EXTREME - ret = pthread_mutex_lock(&urcu_mutex); + ret = pthread_mutex_lock(mutex); if (ret) { perror("Error in pthread mutex lock"); exit(-1); } #else /* #ifndef DISTRUST_SIGNALS_EXTREME */ - while ((ret = pthread_mutex_trylock(&urcu_mutex)) != 0) { + while ((ret = pthread_mutex_trylock(mutex)) != 0) { if (ret != EBUSY && ret != EINTR) { printf("ret = %d, errno = %d\n", ret, errno); perror("Error in pthread mutex lock"); @@ -83,11 +83,11 @@ static void internal_urcu_lock(void) #endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */ } -static void internal_urcu_unlock(void) +static void mutex_unlock(pthread_mutex_t *mutex) { int ret; - ret = pthread_mutex_unlock(&urcu_mutex); + ret = pthread_mutex_unlock(mutex); if (ret) { perror("Error in pthread mutex unlock"); exit(-1); @@ -102,18 +102,39 @@ static void wait_gp(void) /* Read reader_gp before read futex */ smp_rmb(); if (uatomic_read(&gp_futex) == -1) - futex(&gp_futex, FUTEX_WAIT, -1, + futex_noasync(&gp_futex, FUTEX_WAIT, -1, NULL, NULL, 0); } -static void wait_for_quiescent_state(void) +static void update_counter_and_wait(void) { LIST_HEAD(qsreaders); int wait_loops = 0; - struct urcu_reader *index, *tmp; + struct rcu_reader *index, *tmp; + +#if (BITS_PER_LONG < 64) + /* Switch parity: 0 -> 1, 1 -> 0 */ + STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR); +#else /* !(BITS_PER_LONG < 64) */ + /* Increment current G.P. */ + STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR); +#endif /* !(BITS_PER_LONG < 64) */ + + /* + * Must commit rcu_gp_ctr update to memory before waiting for quiescent + * state. Failure to do so could result in the writer waiting forever + * while new readers are always accessing data (no progress). Enforce + * compiler-order of store to rcu_gp_ctr before load rcu_reader ctr. + */ + barrier(); + + /* + * Adding a smp_mb() which is _not_ formally required, but makes the + * model easier to understand. It does not have a big performance impact + * anyway, given this is the write-side. + */ + smp_mb(); - if (list_empty(®istry)) - return; /* * Wait for each thread rcu_reader_qs_gp count to become 0. */ @@ -125,9 +146,9 @@ static void wait_for_quiescent_state(void) smp_mb(); } - list_for_each_entry_safe(index, tmp, ®istry, head) { + list_for_each_entry_safe(index, tmp, ®istry, node) { if (!rcu_gp_ongoing(&index->ctr)) - list_move(&index->head, &qsreaders); + list_move(&index->node, &qsreaders); } if (list_empty(®istry)) { @@ -159,19 +180,11 @@ static void wait_for_quiescent_state(void) */ #if (BITS_PER_LONG < 64) -/* - * called with urcu_mutex held. - */ -static void switch_next_urcu_qparity(void) -{ - STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR); -} - void synchronize_rcu(void) { unsigned long was_online; - was_online = urcu_reader.ctr; + was_online = rcu_reader.ctr; /* All threads should read qparity before accessing data structure * where new ptr points to. @@ -185,56 +198,47 @@ void synchronize_rcu(void) * threads registered as readers. */ if (was_online) - STORE_SHARED(urcu_reader.ctr, 0); + STORE_SHARED(rcu_reader.ctr, 0); - internal_urcu_lock(); + mutex_lock(&rcu_gp_lock); - switch_next_urcu_qparity(); /* 0 -> 1 */ - - /* - * Must commit qparity update to memory before waiting for parity - * 0 quiescent state. Failure to do so could result in the writer - * waiting forever while new readers are always accessing data (no - * progress). - * Ensured by STORE_SHARED and LOAD_SHARED. - */ + if (list_empty(®istry)) + goto out; /* * Wait for previous parity to be empty of readers. */ - wait_for_quiescent_state(); /* Wait readers in parity 0 */ + update_counter_and_wait(); /* 0 -> 1, wait readers in parity 0 */ /* * Must finish waiting for quiescent state for parity 0 before - * committing qparity update to memory. Failure to do so could result in - * the writer waiting forever while new readers are always accessing - * data (no progress). - * Ensured by STORE_SHARED and LOAD_SHARED. + * committing next rcu_gp_ctr update to memory. Failure to do so could + * result in the writer waiting forever while new readers are always + * accessing data (no progress). Enforce compiler-order of load + * rcu_reader ctr before store to rcu_gp_ctr. */ - - switch_next_urcu_qparity(); /* 1 -> 0 */ + barrier(); /* - * Must commit qparity update to memory before waiting for parity - * 1 quiescent state. Failure to do so could result in the writer - * waiting forever while new readers are always accessing data (no - * progress). - * Ensured by STORE_SHARED and LOAD_SHARED. + * Adding a smp_mb() which is _not_ formally required, but makes the + * model easier to understand. It does not have a big performance impact + * anyway, given this is the write-side. */ + smp_mb(); /* * Wait for previous parity to be empty of readers. */ - wait_for_quiescent_state(); /* Wait readers in parity 1 */ - - internal_urcu_unlock(); + update_counter_and_wait(); /* 1 -> 0, wait readers in parity 1 */ +out: + mutex_unlock(&rcu_gp_lock); /* * Finish waiting for reader threads before letting the old ptr being * freed. */ if (was_online) - _STORE_SHARED(urcu_reader.ctr, LOAD_SHARED(urcu_gp_ctr)); + _STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr)); smp_mb(); } #else /* !(BITS_PER_LONG < 64) */ @@ -242,7 +246,7 @@ void synchronize_rcu(void) { unsigned long was_online; - was_online = urcu_reader.ctr; + was_online = rcu_reader.ctr; /* * Mark the writer thread offline to make sure we don't wait for @@ -251,15 +255,17 @@ void synchronize_rcu(void) */ smp_mb(); if (was_online) - STORE_SHARED(urcu_reader.ctr, 0); + STORE_SHARED(rcu_reader.ctr, 0); - internal_urcu_lock(); - STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr + RCU_GP_CTR); - wait_for_quiescent_state(); - internal_urcu_unlock(); + mutex_lock(&rcu_gp_lock); + if (list_empty(®istry)) + goto out; + update_counter_and_wait(); +out: + mutex_unlock(&rcu_gp_lock); if (was_online) - _STORE_SHARED(urcu_reader.ctr, LOAD_SHARED(urcu_gp_ctr)); + _STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr)); smp_mb(); } #endif /* !(BITS_PER_LONG < 64) */ @@ -295,12 +301,12 @@ void rcu_thread_online(void) void rcu_register_thread(void) { - urcu_reader.tid = pthread_self(); - assert(urcu_reader.ctr == 0); + rcu_reader.tid = pthread_self(); + assert(rcu_reader.ctr == 0); - internal_urcu_lock(); - list_add(&urcu_reader.head, ®istry); - internal_urcu_unlock(); + mutex_lock(&rcu_gp_lock); + list_add(&rcu_reader.node, ®istry); + mutex_unlock(&rcu_gp_lock); _rcu_thread_online(); } @@ -311,9 +317,9 @@ void rcu_unregister_thread(void) * with a waiting writer. */ _rcu_thread_offline(); - internal_urcu_lock(); - list_del(&urcu_reader.head); - internal_urcu_unlock(); + mutex_lock(&rcu_gp_lock); + list_del(&rcu_reader.node); + mutex_unlock(&rcu_gp_lock); } void rcu_exit(void)