Commit e79e0fe3 authored Oct 03, 2012 by Dmitry Rogozhkin Committed by Daniel Vetter Oct 04, 2012

drm/i915: EBUSY status handling added to i915_gem_fault().



Subsequent threads returning EBUSY from vm_insert_pfn() was not handled
correctly. As a result concurrent access from new threads to
mmapped data caused SIGBUS.

Note that this fixes i-g-t/tests/gem_threaded_tiled_access.

Tested-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 24773670

drivers/gpu/drm/i915/i915_gem.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1400,6 +1400,11 @@ int i915_gem_fault(struct vm_area_struct vma, struct vm_fault vmf)
		case 0:
		case -ERESTARTSYS:
		case -EINTR:
		case -EBUSY:
		/*
		* EBUSY is ok: this just means that another thread
		* already did the job.
		*/
		return VM_FAULT_NOPAGE;
		case -ENOMEM:
		return VM_FAULT_OOM;