[4.7,132/186] drm: Restore double clflush on the last partial cacheline

Commit Message

Greg Kroah-Hartman Aug. 18, 2016, 1:59 p.m. UTC

4.7-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Chris Wilson <[e-mail]>

commit 396f5d62d1a5fd99421855a08ffdef8edb43c76e upstream.

This effectively reverts

commit afcd950cafea6e27b739fe7772cbbeed37d05b8b
Author: Chris Wilson <[e-mail]>
Date:   Wed Jun 10 15:58:01 2015 +0100

    drm: Avoid the double clflush on the last cache line in drm_clflush_virt_range()

as we have observed issues with serialisation of the clflush operations
on Baytrail+ Atoms with partial updates. Applying the double flush on the
last cacheline forces that clflush to be ordered with respect to the
previous clflush, and the mfence then protects against prefetches crossing
the clflush boundary.

The same issue can be demonstrated in userspace with igt/gem_exec_flush.

Fixes: afcd950cafea6 (drm: Avoid the double clflush on the last cache...)
Testcase: igt/gem_concurrent_blit
Testcase: igt/gem_partial_pread_pwrite
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92845
Signed-off-by: Chris Wilson <[e-mail]>
Cc: [e-mail]
Cc: Akash Goel <[e-mail]>
Cc: Imre Deak <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Jason Ekstrand <[e-mail]>
Reviewed-by: Mika Kuoppala <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
Link: http://patchwork.freedesktop.org/patch/msgid/[e-mail]
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

---
 drivers/gpu/drm/drm_cache.c |    1 +
 1 file changed, 1 insertion(+)

Patch

--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -136,6 +136,7 @@  drm_clflush_virt_range(void *addr, unsig
 		mb();
 		for (; addr < end; addr += size)
 			clflushopt(addr);
+		clflushopt(end - 1); /* force serialisation */
 		mb();
 		return;
 	}