drm/i915: EBUSY status handling added to i915_gem_fault().
authorDmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Wed, 3 Oct 2012 14:15:26 +0000 (17:15 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 4 Oct 2012 08:33:42 +0000 (10:33 +0200)
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>
drivers/gpu/drm/i915/i915_gem.c

index 76bbb379d389b93c78353425ec095d633b8a8663..5fa3419461c5ddb46fa2b70b797b8c4ad3567e59 100644 (file)
@@ -1400,6 +1400,11 @@ out:
        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;