Commit 2ff396be authored Sep 02, 2014 by Jeff Moyer Committed by Benjamin LaHaise Sep 02, 2014

aio: add missing smp_rmb() in read_events_ring



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: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Cc: stable@vger.kernel.org

parent 7be141d0

fs/aio.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1111,6 +1111,12 @@ static long aio_read_events_ring(struct kioctx *ctx,
		tail = ring->tail;
		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);

		if (head == tail)