aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2013-10-20 11:57:52 -0400
committerRob Clark <robdclark@gmail.com>2013-11-01 12:39:45 -0400
commit505886d50633385f57e8e2b14fbb636cecb50297 (patch)
tree6a32dd7d183a168dd62133f3f2a70d899e92c711
parentedd4fc63a33eeeb922503b14e8040a3b028c76a5 (diff)
drm/msm: EBUSY status handling in msm_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. See e79e0fe3 Signed-off-by: Rob Clark <robdclark@gmail.com> Acked-by: David Brown <davidb@codeaurora.org>
-rw-r--r--drivers/gpu/drm/msm/msm_gem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 291939de299e..e587d251c590 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -178,6 +178,11 @@ out:
178 case 0: 178 case 0:
179 case -ERESTARTSYS: 179 case -ERESTARTSYS:
180 case -EINTR: 180 case -EINTR:
181 case -EBUSY:
182 /*
183 * EBUSY is ok: this just means that another thread
184 * already did the job.
185 */
181 return VM_FAULT_NOPAGE; 186 return VM_FAULT_NOPAGE;
182 case -ENOMEM: 187 case -ENOMEM:
183 return VM_FAULT_OOM; 188 return VM_FAULT_OOM;