aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/queueing.c
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2018-05-28 00:40:09 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-06-18 15:08:56 +0200
commit9eba9af992d149fe7a20c77de7fde8742df83f60 (patch)
tree9ee4c4c76f2a3dcac2bcbbbbe4579fa0be988c90 /src/queueing.c
parentqemu: bump default kernel (diff)
downloadwireguard-monolithic-historical-9eba9af992d149fe7a20c77de7fde8742df83f60.tar.xz
wireguard-monolithic-historical-9eba9af992d149fe7a20c77de7fde8742df83f60.zip
[WIP] Implement a lock-free MPMC ring buffer
TODO: actually use the right memory barriers in the right places TODO: eliminate false sharing between mpmc_ptr_ring members TODO: reconsider atomic_long_t vs. atomic_t, vs. the type of size in _init() TODO: sprinkle likely/unlikely on some branches FIXME: it still crashes
Diffstat (limited to 'src/queueing.c')
-rw-r--r--src/queueing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/queueing.c b/src/queueing.c
index f33395e..80048c9 100644
--- a/src/queueing.c
+++ b/src/queueing.c
@@ -25,7 +25,7 @@ int packet_queue_init(struct crypt_queue *queue, work_func_t function, bool mult
int ret;
memset(queue, 0, sizeof(*queue));
- ret = ptr_ring_init(&queue->ring, len, GFP_KERNEL);
+ ret = mpmc_ptr_ring_init(&queue->ring, len, GFP_KERNEL);
if (ret)
return ret;
if (multicore) {
@@ -41,6 +41,6 @@ void packet_queue_free(struct crypt_queue *queue, bool multicore)
{
if (multicore)
free_percpu(queue->worker);
- WARN_ON(!__ptr_ring_empty(&queue->ring));
- ptr_ring_cleanup(&queue->ring, NULL);
+ WARN_ON(!mpmc_ptr_ring_empty(&queue->ring));
+ mpmc_ptr_ring_cleanup(&queue->ring, NULL);
}