Commit e7ac34bf authored by Jeff Moyer's avatar Jeff Moyer Committed by Greg Kroah-Hartman

aio: add missing smp_rmb() in read_events_ring

commit 2ff396be upstream.

We ran into a case on ppc64 running mariadb where io_getevents would
return zeroed out I/O events.  After adding instrumentation, it became
clear that there was some missing synchronization between reading the
tail pointer and the events themselves.  This small patch fixes the
problem in testing.

Thanks to Zach for helping to look into this, and suggesting the fix.
Signed-off-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1fd18c3
...@@ -1134,6 +1134,12 @@ static long aio_read_events_ring(struct kioctx *ctx, ...@@ -1134,6 +1134,12 @@ static long aio_read_events_ring(struct kioctx *ctx,
tail = ring->tail; tail = ring->tail;
kunmap_atomic(ring); kunmap_atomic(ring);
/*
* Ensure that once we've read the current tail pointer, that
* we also see the events that were stored up to the tail.
*/
smp_rmb();
pr_debug("h%u t%u m%u\n", head, tail, ctx->nr_events); pr_debug("h%u t%u m%u\n", head, tail, ctx->nr_events);
if (head == tail) if (head == tail)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment