From: Stefan Bühler <source@stbuehler.de>
Date: Wed, 24 Apr 2019 21:54:18 +0000 (+0200)
Subject: io_uring: remove unnecessary barrier before reading cq head
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=115e12e58dbc055e98c965e3255aed7b20214f95;p=openwrt%2Fstaging%2Fblogic.git

io_uring: remove unnecessary barrier before reading cq head

The memory operations before reading cq head are unrelated and we
don't care about their order.

Document that the control dependency in combination with READ_ONCE and
WRITE_ONCE forms a barrier we need.

Signed-off-by: Stefan Bühler <source@stbuehler.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index bb71b7f00bb3..3671a654a146 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -431,8 +431,11 @@ static struct io_uring_cqe *io_get_cqring(struct io_ring_ctx *ctx)
 	unsigned tail;
 
 	tail = ctx->cached_cq_tail;
-	/* See comment at the top of the file */
-	smp_rmb();
+	/*
+	 * writes to the cq entry need to come after reading head; the
+	 * control dependency is enough as we're using WRITE_ONCE to
+	 * fill the cq entry
+	 */
 	if (tail - READ_ONCE(ring->r.head) == ring->ring_entries)
 		return NULL;