From a5eb5ffcbd3f901c8e56ab3649fd06056b27536f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 12 Jul 2010 20:54:52 -0400 Subject: [PATCH] Add wait-free push/blocking pop stack Signed-off-by: Mathieu Desnoyers --- tests/Makefile.am | 3 +- tests/test_urcu_wfs.c | 423 ++++++++++++++++++++++++++++++++++++++++++ urcu/rculfqueue.h | 2 +- urcu/rcuwfstack.h | 101 ++++++++++ 4 files changed, 527 insertions(+), 2 deletions(-) create mode 100644 tests/test_urcu_wfs.c create mode 100644 urcu/rcuwfstack.h diff --git a/tests/Makefile.am b/tests/Makefile.am index 9fca6b1..3e62802 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,7 +13,7 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \ test_urcu_mb_lgc test_qsbr_dynamic_link test_urcu_defer \ test_uatomic test_urcu_assign test_urcu_assign_dynamic_link \ test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \ - test_urcu_lfq test_urcu_lfs + test_urcu_lfq test_urcu_lfs test_urcu_wfs noinst_HEADERS = rcutorture.h if COMPAT_ARCH @@ -154,6 +154,7 @@ test_urcu_bp_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_lfq_SOURCES = test_urcu_lfq.c $(URCU_DEFER) test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_DEFER) +test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_DEFER) urcutorture.c: api.h diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c new file mode 100644 index 0000000..4802ee7 --- /dev/null +++ b/tests/test_urcu_wfs.c @@ -0,0 +1,423 @@ +/* + * test_urcu_wfs.c + * + * Userspace RCU library - example RCU-based lock-free stack + * + * Copyright February 2010 - Mathieu Desnoyers + * Copyright February 2010 - Paolo Bonzini + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include "../config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* hardcoded number of CPUs */ +#define NR_CPUS 16384 + +#if defined(_syscall0) +_syscall0(pid_t, gettid) +#elif defined(__NR_gettid) +static inline pid_t gettid(void) +{ + return syscall(__NR_gettid); +} +#else +#warning "use pid as tid" +static inline pid_t gettid(void) +{ + return getpid(); +} +#endif + +#ifndef DYNAMIC_LINK_TEST +#define _LGPL_SOURCE +#endif +#include +#include +#include + +static volatile int test_go, test_stop; + +static unsigned long rduration; + +static unsigned long duration; + +/* read-side C.S. duration, in loops */ +static unsigned long wdelay; + +static inline void loop_sleep(unsigned long l) +{ + while(l-- != 0) + cpu_relax(); +} + +static int verbose_mode; + +#define printf_verbose(fmt, args...) \ + do { \ + if (verbose_mode) \ + printf(fmt, args); \ + } while (0) + +static unsigned int cpu_affinities[NR_CPUS]; +static unsigned int next_aff = 0; +static int use_affinity = 0; + +pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER; + +#ifndef HAVE_CPU_SET_T +typedef unsigned long cpu_set_t; +# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0) +# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0) +#endif + +static void set_affinity(void) +{ + cpu_set_t mask; + int cpu; + int ret; + + if (!use_affinity) + return; + +#if HAVE_SCHED_SETAFFINITY + ret = pthread_mutex_lock(&affinity_mutex); + if (ret) { + perror("Error in pthread mutex lock"); + exit(-1); + } + cpu = cpu_affinities[next_aff++]; + ret = pthread_mutex_unlock(&affinity_mutex); + if (ret) { + perror("Error in pthread mutex unlock"); + exit(-1); + } + + CPU_ZERO(&mask); + CPU_SET(cpu, &mask); +#if SCHED_SETAFFINITY_ARGS == 2 + sched_setaffinity(0, &mask); +#else + sched_setaffinity(0, sizeof(mask), &mask); +#endif +#endif /* HAVE_SCHED_SETAFFINITY */ +} + +/* + * returns 0 if test should end. + */ +static int test_duration_dequeue(void) +{ + return !test_stop; +} + +static int test_duration_enqueue(void) +{ + return !test_stop; +} + +static unsigned long long __thread nr_dequeues; +static unsigned long long __thread nr_enqueues; + +static unsigned long long __thread nr_successful_dequeues; +static unsigned long long __thread nr_successful_enqueues; + +static unsigned int nr_enqueuers; +static unsigned int nr_dequeuers; + +static struct rcu_wfs_stack s; + +void *thr_enqueuer(void *_count) +{ + unsigned long long *count = _count; + + printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", + "enqueuer", pthread_self(), (unsigned long)gettid()); + + set_affinity(); + + rcu_register_thread(); + + while (!test_go) + { + } + smp_mb(); + + for (;;) { + struct rcu_wfs_node *node = malloc(sizeof(*node)); + if (!node) + goto fail; + rcu_wfs_node_init(node); + rcu_wfs_push(&s, node); + nr_successful_enqueues++; + + if (unlikely(wdelay)) + loop_sleep(wdelay); +fail: + nr_enqueues++; + if (unlikely(!test_duration_enqueue())) + break; + } + + rcu_unregister_thread(); + + count[0] = nr_enqueues; + count[1] = nr_successful_enqueues; + printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, " + "enqueues %llu successful_enqueues %llu\n", + pthread_self(), (unsigned long)gettid(), nr_enqueues, + nr_successful_enqueues); + return ((void*)1); + +} + +void *thr_dequeuer(void *_count) +{ + unsigned long long *count = _count; + + printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", + "dequeuer", pthread_self(), (unsigned long)gettid()); + + set_affinity(); + + rcu_defer_register_thread(); + rcu_register_thread(); + + while (!test_go) + { + } + smp_mb(); + + for (;;) { + struct rcu_wfs_node *node = rcu_wfs_pop(&s); + + if (node) { + defer_rcu(free, node); + nr_successful_dequeues++; + } + + nr_dequeues++; + if (unlikely(!test_duration_dequeue())) + break; + if (unlikely(rduration)) + loop_sleep(rduration); + } + + rcu_unregister_thread(); + rcu_defer_unregister_thread(); + + printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, " + "dequeues %llu, successful_dequeues %llu\n", + pthread_self(), (unsigned long)gettid(), nr_dequeues, + nr_successful_dequeues); + count[0] = nr_dequeues; + count[1] = nr_successful_dequeues; + return ((void*)2); +} + +void test_end(struct rcu_wfs_stack *s, unsigned long long *nr_dequeues) +{ + struct rcu_wfs_node *node; + + do { + node = rcu_wfs_pop(s); + if (node) { + free(node); + (*nr_dequeues)++; + } + } while (node); +} + +void show_usage(int argc, char **argv) +{ + printf("Usage : %s nr_dequeuers nr_enqueuers duration (s)", argv[0]); + printf(" [-d delay] (enqueuer period (in loops))"); + printf(" [-c duration] (dequeuer period (in loops))"); + printf(" [-v] (verbose output)"); + printf(" [-a cpu#] [-a cpu#]... (affinity)"); + printf("\n"); +} + +int main(int argc, char **argv) +{ + int err; + pthread_t *tid_enqueuer, *tid_dequeuer; + void *tret; + unsigned long long *count_enqueuer, *count_dequeuer; + unsigned long long tot_enqueues = 0, tot_dequeues = 0; + unsigned long long tot_successful_enqueues = 0, + tot_successful_dequeues = 0; + unsigned long long end_dequeues = 0; + int i, a; + + if (argc < 4) { + show_usage(argc, argv); + return -1; + } + + err = sscanf(argv[1], "%u", &nr_dequeuers); + if (err != 1) { + show_usage(argc, argv); + return -1; + } + + err = sscanf(argv[2], "%u", &nr_enqueuers); + if (err != 1) { + show_usage(argc, argv); + return -1; + } + + err = sscanf(argv[3], "%lu", &duration); + if (err != 1) { + show_usage(argc, argv); + return -1; + } + + for (i = 4; i < argc; i++) { + if (argv[i][0] != '-') + continue; + switch (argv[i][1]) { + case 'a': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + a = atoi(argv[++i]); + cpu_affinities[next_aff++] = a; + use_affinity = 1; + printf_verbose("Adding CPU %d affinity\n", a); + break; + case 'c': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + rduration = atol(argv[++i]); + break; + case 'd': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + wdelay = atol(argv[++i]); + break; + case 'v': + verbose_mode = 1; + break; + } + } + + printf_verbose("running test for %lu seconds, %u enqueuers, " + "%u dequeuers.\n", + duration, nr_enqueuers, nr_dequeuers); + printf_verbose("Writer delay : %lu loops.\n", rduration); + printf_verbose("Reader duration : %lu loops.\n", wdelay); + printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", + "main", pthread_self(), (unsigned long)gettid()); + + tid_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers); + tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers); + count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers); + count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers); + rcu_wfs_init(&s); + + next_aff = 0; + + for (i = 0; i < nr_enqueuers; i++) { + err = pthread_create(&tid_enqueuer[i], NULL, thr_enqueuer, + &count_enqueuer[2 * i]); + if (err != 0) + exit(1); + } + for (i = 0; i < nr_dequeuers; i++) { + err = pthread_create(&tid_dequeuer[i], NULL, thr_dequeuer, + &count_dequeuer[2 * i]); + if (err != 0) + exit(1); + } + + smp_mb(); + + test_go = 1; + + for (i = 0; i < duration; i++) { + sleep(1); + if (verbose_mode) + write (1, ".", 1); + } + + test_stop = 1; + + for (i = 0; i < nr_enqueuers; i++) { + err = pthread_join(tid_enqueuer[i], &tret); + if (err != 0) + exit(1); + tot_enqueues += count_enqueuer[2 * i]; + tot_successful_enqueues += count_enqueuer[2 * i + 1]; + } + for (i = 0; i < nr_dequeuers; i++) { + err = pthread_join(tid_dequeuer[i], &tret); + if (err != 0) + exit(1); + tot_dequeues += count_dequeuer[2 * i]; + tot_successful_dequeues += count_dequeuer[2 * i + 1]; + } + + test_end(&s, &end_dequeues); + + printf_verbose("total number of enqueues : %llu, dequeues %llu\n", + tot_enqueues, tot_dequeues); + printf_verbose("total number of successful enqueues : %llu, " + "successful dequeues %llu\n", + tot_successful_enqueues, tot_successful_dequeues); + printf("SUMMARY %-25s testdur %4lu nr_enqueuers %3u wdelay %6lu " + "nr_dequeuers %3u " + "rdur %6lu nr_enqueues %12llu nr_dequeues %12llu " + "successful enqueues %12llu successful dequeues %12llu " + "end_dequeues %llu nr_ops %12llu\n", + argv[0], duration, nr_enqueuers, wdelay, + nr_dequeuers, rduration, tot_enqueues, tot_dequeues, + tot_successful_enqueues, + tot_successful_dequeues, end_dequeues, + tot_enqueues + tot_dequeues); + if (tot_successful_enqueues != tot_successful_dequeues + end_dequeues) + printf("WARNING! Discrepancy between nr succ. enqueues %llu vs " + "succ. dequeues + end dequeues %llu.\n", + tot_successful_enqueues, + tot_successful_dequeues + end_dequeues); + + free(count_enqueuer); + free(count_dequeuer); + free(tid_enqueuer); + free(tid_dequeuer); + return 0; +} diff --git a/urcu/rculfqueue.h b/urcu/rculfqueue.h index f9b14fe..76da6b1 100644 --- a/urcu/rculfqueue.h +++ b/urcu/rculfqueue.h @@ -78,7 +78,7 @@ void rcu_lfq_enqueue(struct rcu_lfq_queue *q, struct rcu_lfq_node *node) struct rcu_lfq_node *next; /* - * Typically expect tail to be NULL. + * Typically expect tail->next to be NULL. */ next = uatomic_cmpxchg(&tail->next, NULL, node); if (next == NULL) { diff --git a/urcu/rcuwfstack.h b/urcu/rcuwfstack.h new file mode 100644 index 0000000..f2906ce --- /dev/null +++ b/urcu/rcuwfstack.h @@ -0,0 +1,101 @@ +/* + * rcuwfstack.h + * + * Userspace RCU library - RCU Stack with Wait-Free push, Blocking pop. + * + * Copyright 2010 - Mathieu Desnoyers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if (!defined(_GNU_SOURCE) && !defined(_LGPL_SOURCE)) +#error "Dynamic loader LGPL wrappers not implemented yet" +#endif + +struct rcu_wfs_node { + struct rcu_wfs_node *next; +}; + +struct rcu_wfs_stack { + struct rcu_wfs_node *head; + struct rcu_wfs_node end; +}; + +void rcu_wfs_node_init(struct rcu_wfs_node *node) +{ + node->next = NULL; +} + +void rcu_wfs_init(struct rcu_wfs_stack *s) +{ + s->head = &s->end; + rcu_wfs_node_init(&s->end); +} + +void rcu_wfs_push(struct rcu_wfs_stack *s, struct rcu_wfs_node *node) +{ + struct rcu_wfs_node *old_head; + + /* + * uatomic_xchg() implicit memory barrier orders earlier stores to node + * (setting it to NULL) before publication. + */ + old_head = uatomic_xchg(&s->head, node); + /* + * At this point, dequeuers see a NULL node->next, they should busy-wait + * until node->next is set to old_head. + */ + STORE_SHARED(node->next, old_head); +} + +/* + * The caller must wait for a grace period before freeing the returned node. + * Returns NULL if stack is empty. + * + * cmpxchg is protected from ABA races by holding a RCU read lock between + * s->head read and cmpxchg modifying s->head and requiring that dequeuers wait + * for a grace period before freeing the returned node. + * + * TODO: implement adaptative busy-wait and wait/wakeup scheme rather than busy + * loops. Better for UP. + */ +struct rcu_wfs_node * +rcu_wfs_pop(struct rcu_wfs_stack *s) +{ + rcu_read_lock(); + for (;;) { + struct rcu_wfs_node *head = rcu_dereference(s->head); + + if (head != &s->end) { + struct rcu_wfs_node *next = rcu_dereference(head->next); + + /* Retry while head is being set by push(). */ + if (!next) + continue; + + if (uatomic_cmpxchg(&s->head, head, next) == head) { + rcu_read_unlock(); + return head; + } else { + /* Concurrent modification. Retry. */ + continue; + } + } else { + /* Empty stack */ + rcu_read_unlock(); + return NULL; + } + } +} -- 2.34.1