wfcqueue: implement __wfcq_enqueue_head() (v3)
RFC PATCH 1/1 wfcqueue: implement __wfcq_enqueue_head() (v3)
Implement enqueue-to-head. It can run concurrently with enqueue, splice to queue, and iteration, but requires a mutex against dequeue and splice from queue operations.
Useful for special-cases where a queue needs to have nodes enqueued into its head.
This patch is only compile-tested.
Changes since v1:
* Don't require mutual exclusion between traversals and __wfcq_enqueue_head().
Changes since v2:
* Only issue cmpxchg() if queue was empty.
* Add missing memory barrier.
--- include/linux/wfcqueue.h | 76 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 7 deletions(-)
include/linux/wfcqueue.h +69 -7
@@ -55,14 +55,16 @@* [4] __wfcq_splice (source queue) * [5] __wfcq_first * [6] __wfcq_next +* [7] __wfcq_enqueue_head * -* [1] [2] [3] [4] [5] [6] -* [1] - - - - - - -* [2] - - - - - - -* [3] - - X X X X -* [4] - - X - X X -* [5] - - X X - - -* [6] - - X X - - +* [1] [2] [3] [4] [5] [6] [7] +* [1] - - - - - - - +* [2] - - - - - - X +* [3] - - X X X X X +* [4] - - X - X X X +* [5] - - X X - - - +* [6] - - X X - - - +* [7] - X X X - - X * * Besides locking, mutual exclusion of dequeue, splice and iteration * can be ensured by performing all of those operations from a single
@@ -230,6 +232,66 @@ ___wfcq_node_sync_next(struct wfcq_node }/* +* __wfcq_enqueue_head: prepend a node into a queue. +* +* Issues a write memory barrier before enqueue to head. Mutual +* exclusion is the responsibility of the caller. +* +* Returns false if the queue was empty prior to adding the node. +* Returns true otherwise. +*/ +static inline bool __wfcq_enqueue_head (struct wfcq_head *head, +struct wfcq_tail *tail, +struct wfcq_node *node) +{ +bool not_empty =0 ; + +/* +* Move tail if queue was empty. Tail pointer is the +* linearisation point of enqueuers. +*/ +if (CMM_LOAD_SHARED (tail->p) != &head->node + ||cmpxchg (&tail->p, &head->node, node) + != &head->node) { + not_empty =1 ; + +/* +* Queue was non-empty. We need to wait for +* head->node.next to become non-NULL, because a +* concurrent wfcq_append may be updating it. +*/ +CMM_STORE_SHARED (node->next, +___wfcq_node_sync_next (&head->node)); + } + +/* +* If cmpxchg succeeds (queue was empty), tail now points to +* node, but head->node.next is still NULL. Concurrent +* traversals seeing this state will busy-wait until we set +* head->node.next. +* +* Else, queue was observed as not empty: traversals will only +* see node after we set head->node.next. +*/ + +/* +* Orders earlier stores to data structure containing node and +* setting node->next to NULL (or to previous head->node.next +* value) before publication. +*/ +smp_wmb (); + +/* +* From this point, we know that wfcq_append cannot touch +* head->node.next, either because we successfully moved tail->p +* to node, or because we waited for head->node.next to become +* non-NULL. It is therefore safe to update it. +*/ +CMM_STORE_SHARED (head->node.next, node); +return not_empty; +} + +/* * __wfcq_first: get first node of a queue, without dequeuing. * * Content written into the node before enqueue is guaranteed to be
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
Quoted 3 lines · Mathieu Desnoyers
Changes since v2:
* Only issuecmpxchg()if queue was empty.
* Add missing memory barrier.
Thanks!
There's a slight drop in performance either from the barrier or larger code, but I'm not worried (it was around 9-10s before wfcqueue).
$ time ./eponeshotmt -c 1000000 -w 4 -t 4 -f 10 real 0m 5.83s user 0m 1.35s sys 0m 21.95s
I also ran v2 on Davide Libenzi's totalmess epoll stresser for a few hours yesterday without failures. Running totalmess right now on v3, so far so good :)