From patchwork Thu Dec 6 18:21:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Quantal, SRU, 1/1] drm/i915: EBUSY status handling added to i915_gem_fault(). Date: Thu, 06 Dec 2012 08:21:54 -0000 From: Leann Ogasawara X-Patchwork-Id: 204298 Message-Id: To: kernel-team@lists.ubuntu.com From: Dmitry Rogozhkin BugLink: http://bugs.launchpad.net/bugs/1087302 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 Signed-off-by: Dmitry Rogozhkin Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter (cherry picked from commit e79e0fe380847493266fba557217e2773c61bd1b) Signed-off-by: Leann Ogasawara --- drivers/gpu/drm/i915/i915_gem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e4d0187..4406603 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1144,6 +1144,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;