X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_frontend.c;h=3d60c1435c329baf32a27ed9f3148dc8ed8ad88f;hb=155b8d9b967828499487e40aaa239e1bf1bbbb23;hp=310752506550bda15e03d6d57eff5d5f7a43398c;hpb=cf101116238c2e18f6bf927822dbe47aa4e71dec;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 31075250..3d60c143 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -54,6 +54,7 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/percpu.h>
+#include <asm/cacheflush.h>
 
 #include <wrapper/ringbuffer/config.h>
 #include <wrapper/ringbuffer/backend.h>
@@ -1180,6 +1181,47 @@ void lib_ring_buffer_move_consumer(struct lib_ring_buffer *buf,
 }
 EXPORT_SYMBOL_GPL(lib_ring_buffer_move_consumer);
 
+#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+static void lib_ring_buffer_flush_read_subbuf_dcache(
+		const struct lib_ring_buffer_config *config,
+		struct channel *chan,
+		struct lib_ring_buffer *buf)
+{
+	struct lib_ring_buffer_backend_pages *pages;
+	unsigned long sb_bindex, id, i, nr_pages;
+
+	if (config->output != RING_BUFFER_MMAP)
+		return;
+
+	/*
+	 * Architectures with caches aliased on virtual addresses may
+	 * use different cache lines for the linear mapping vs
+	 * user-space memory mapping. Given that the ring buffer is
+	 * based on the kernel linear mapping, aligning it with the
+	 * user-space mapping is not straightforward, and would require
+	 * extra TLB entries. Therefore, simply flush the dcache for the
+	 * entire sub-buffer before reading it.
+	 */
+	id = buf->backend.buf_rsb.id;
+	sb_bindex = subbuffer_id_get_index(config, id);
+	pages = buf->backend.array[sb_bindex];
+	nr_pages = buf->backend.num_pages_per_subbuf;
+	for (i = 0; i < nr_pages; i++) {
+		struct lib_ring_buffer_backend_page *backend_page;
+
+		backend_page = &pages->p[i];
+		flush_dcache_page(pfn_to_page(backend_page->pfn));
+	}
+}
+#else
+static void lib_ring_buffer_flush_read_subbuf_dcache(
+		const struct lib_ring_buffer_config *config,
+		struct channel *chan,
+		struct lib_ring_buffer *buf)
+{
+}
+#endif
+
 /**
  * lib_ring_buffer_get_subbuf - get exclusive access to subbuffer for reading
  * @buf: ring buffer
@@ -1322,6 +1364,8 @@ retry:
 	buf->get_subbuf_consumed = consumed;
 	buf->get_subbuf = 1;
 
+	lib_ring_buffer_flush_read_subbuf_dcache(config, chan, buf);
+
 	return 0;
 
 nodata: